From 84cd0d991a1b121ab2d27d8cc09b37ba52ec2841 Mon Sep 17 00:00:00 2001
From: Zooko O'Whielacronx <zooko@zooko.com>
Date: Thu, 9 Sep 2010 23:14:11 -0700
Subject: [PATCH] setup: copy in this fix from zetuptoolz and the accompanying
 new version number of zetuptoolz:
 http://tahoe-lafs.org/trac/zetuptoolz/ticket/1

---
 .../EGG-INFO/PKG-INFO                                  |  0
 .../EGG-INFO/SOURCES.txt                               |  0
 .../EGG-INFO/dependency_links.txt                      |  0
 .../EGG-INFO/entry_points.txt                          |  0
 .../EGG-INFO/top_level.txt                             |  0
 .../EGG-INFO/zip-safe                                  |  0
 .../easy_install.py                                    |  0
 .../pkg_resources.py                                   |  0
 .../setuptools/__init__.py                             | 10 +++++++++-
 .../setuptools/archive_util.py                         |  0
 .../setuptools/command/__init__.py                     |  0
 .../setuptools/command/alias.py                        |  0
 .../setuptools/command/bdist_egg.py                    |  0
 .../setuptools/command/bdist_rpm.py                    |  0
 .../setuptools/command/bdist_wininst.py                |  0
 .../setuptools/command/build_ext.py                    |  0
 .../setuptools/command/build_py.py                     |  0
 .../setuptools/command/develop.py                      |  0
 .../setuptools/command/easy_install.py                 |  5 ++++-
 .../setuptools/command/egg_info.py                     |  0
 .../setuptools/command/install.py                      |  0
 .../setuptools/command/install_egg_info.py             |  0
 .../setuptools/command/install_lib.py                  |  0
 .../setuptools/command/install_scripts.py              |  0
 .../setuptools/command/register.py                     |  0
 .../setuptools/command/rotate.py                       |  0
 .../setuptools/command/saveopts.py                     |  0
 .../setuptools/command/scriptsetup.py                  |  0
 .../setuptools/command/sdist.py                        |  0
 .../setuptools/command/setopt.py                       |  0
 .../setuptools/command/test.py                         |  0
 .../setuptools/command/upload.py                       |  0
 .../setuptools/depends.py                              |  0
 .../setuptools/dist.py                                 |  0
 .../setuptools/extension.py                            |  0
 .../setuptools/package_index.py                        |  0
 .../setuptools/sandbox.py                              |  0
 .../setuptools/site-patch.py                           |  0
 .../setuptools/tests/__init__.py                       |  0
 .../setuptools/tests/test_packageindex.py              |  0
 .../setuptools/tests/test_resources.py                 |  0
 .../zetuptoolz.txt                                     |  0
 42 files changed, 13 insertions(+), 2 deletions(-)
 rename {setuptools-0.6c16dev.egg => setuptools-0.6c16dev2.egg}/EGG-INFO/PKG-INFO (100%)
 rename {setuptools-0.6c16dev.egg => setuptools-0.6c16dev2.egg}/EGG-INFO/SOURCES.txt (100%)
 rename {setuptools-0.6c16dev.egg => setuptools-0.6c16dev2.egg}/EGG-INFO/dependency_links.txt (100%)
 rename {setuptools-0.6c16dev.egg => setuptools-0.6c16dev2.egg}/EGG-INFO/entry_points.txt (100%)
 rename {setuptools-0.6c16dev.egg => setuptools-0.6c16dev2.egg}/EGG-INFO/top_level.txt (100%)
 rename {setuptools-0.6c16dev.egg => setuptools-0.6c16dev2.egg}/EGG-INFO/zip-safe (100%)
 rename {setuptools-0.6c16dev.egg => setuptools-0.6c16dev2.egg}/easy_install.py (100%)
 rename {setuptools-0.6c16dev.egg => setuptools-0.6c16dev2.egg}/pkg_resources.py (100%)
 rename {setuptools-0.6c16dev.egg => setuptools-0.6c16dev2.egg}/setuptools/__init__.py (89%)
 rename {setuptools-0.6c16dev.egg => setuptools-0.6c16dev2.egg}/setuptools/archive_util.py (100%)
 rename {setuptools-0.6c16dev.egg => setuptools-0.6c16dev2.egg}/setuptools/command/__init__.py (100%)
 rename {setuptools-0.6c16dev.egg => setuptools-0.6c16dev2.egg}/setuptools/command/alias.py (100%)
 rename {setuptools-0.6c16dev.egg => setuptools-0.6c16dev2.egg}/setuptools/command/bdist_egg.py (100%)
 rename {setuptools-0.6c16dev.egg => setuptools-0.6c16dev2.egg}/setuptools/command/bdist_rpm.py (100%)
 rename {setuptools-0.6c16dev.egg => setuptools-0.6c16dev2.egg}/setuptools/command/bdist_wininst.py (100%)
 rename {setuptools-0.6c16dev.egg => setuptools-0.6c16dev2.egg}/setuptools/command/build_ext.py (100%)
 rename {setuptools-0.6c16dev.egg => setuptools-0.6c16dev2.egg}/setuptools/command/build_py.py (100%)
 rename {setuptools-0.6c16dev.egg => setuptools-0.6c16dev2.egg}/setuptools/command/develop.py (100%)
 rename {setuptools-0.6c16dev.egg => setuptools-0.6c16dev2.egg}/setuptools/command/easy_install.py (99%)
 rename {setuptools-0.6c16dev.egg => setuptools-0.6c16dev2.egg}/setuptools/command/egg_info.py (100%)
 rename {setuptools-0.6c16dev.egg => setuptools-0.6c16dev2.egg}/setuptools/command/install.py (100%)
 rename {setuptools-0.6c16dev.egg => setuptools-0.6c16dev2.egg}/setuptools/command/install_egg_info.py (100%)
 rename {setuptools-0.6c16dev.egg => setuptools-0.6c16dev2.egg}/setuptools/command/install_lib.py (100%)
 rename {setuptools-0.6c16dev.egg => setuptools-0.6c16dev2.egg}/setuptools/command/install_scripts.py (100%)
 rename {setuptools-0.6c16dev.egg => setuptools-0.6c16dev2.egg}/setuptools/command/register.py (100%)
 rename {setuptools-0.6c16dev.egg => setuptools-0.6c16dev2.egg}/setuptools/command/rotate.py (100%)
 rename {setuptools-0.6c16dev.egg => setuptools-0.6c16dev2.egg}/setuptools/command/saveopts.py (100%)
 rename {setuptools-0.6c16dev.egg => setuptools-0.6c16dev2.egg}/setuptools/command/scriptsetup.py (100%)
 rename {setuptools-0.6c16dev.egg => setuptools-0.6c16dev2.egg}/setuptools/command/sdist.py (100%)
 rename {setuptools-0.6c16dev.egg => setuptools-0.6c16dev2.egg}/setuptools/command/setopt.py (100%)
 rename {setuptools-0.6c16dev.egg => setuptools-0.6c16dev2.egg}/setuptools/command/test.py (100%)
 rename {setuptools-0.6c16dev.egg => setuptools-0.6c16dev2.egg}/setuptools/command/upload.py (100%)
 rename {setuptools-0.6c16dev.egg => setuptools-0.6c16dev2.egg}/setuptools/depends.py (100%)
 rename {setuptools-0.6c16dev.egg => setuptools-0.6c16dev2.egg}/setuptools/dist.py (100%)
 rename {setuptools-0.6c16dev.egg => setuptools-0.6c16dev2.egg}/setuptools/extension.py (100%)
 rename {setuptools-0.6c16dev.egg => setuptools-0.6c16dev2.egg}/setuptools/package_index.py (100%)
 rename {setuptools-0.6c16dev.egg => setuptools-0.6c16dev2.egg}/setuptools/sandbox.py (100%)
 rename {setuptools-0.6c16dev.egg => setuptools-0.6c16dev2.egg}/setuptools/site-patch.py (100%)
 rename {setuptools-0.6c16dev.egg => setuptools-0.6c16dev2.egg}/setuptools/tests/__init__.py (100%)
 rename {setuptools-0.6c16dev.egg => setuptools-0.6c16dev2.egg}/setuptools/tests/test_packageindex.py (100%)
 rename {setuptools-0.6c16dev.egg => setuptools-0.6c16dev2.egg}/setuptools/tests/test_resources.py (100%)
 rename {setuptools-0.6c16dev.egg => setuptools-0.6c16dev2.egg}/zetuptoolz.txt (100%)

diff --git a/setuptools-0.6c16dev.egg/EGG-INFO/PKG-INFO b/setuptools-0.6c16dev2.egg/EGG-INFO/PKG-INFO
similarity index 100%
rename from setuptools-0.6c16dev.egg/EGG-INFO/PKG-INFO
rename to setuptools-0.6c16dev2.egg/EGG-INFO/PKG-INFO
diff --git a/setuptools-0.6c16dev.egg/EGG-INFO/SOURCES.txt b/setuptools-0.6c16dev2.egg/EGG-INFO/SOURCES.txt
similarity index 100%
rename from setuptools-0.6c16dev.egg/EGG-INFO/SOURCES.txt
rename to setuptools-0.6c16dev2.egg/EGG-INFO/SOURCES.txt
diff --git a/setuptools-0.6c16dev.egg/EGG-INFO/dependency_links.txt b/setuptools-0.6c16dev2.egg/EGG-INFO/dependency_links.txt
similarity index 100%
rename from setuptools-0.6c16dev.egg/EGG-INFO/dependency_links.txt
rename to setuptools-0.6c16dev2.egg/EGG-INFO/dependency_links.txt
diff --git a/setuptools-0.6c16dev.egg/EGG-INFO/entry_points.txt b/setuptools-0.6c16dev2.egg/EGG-INFO/entry_points.txt
similarity index 100%
rename from setuptools-0.6c16dev.egg/EGG-INFO/entry_points.txt
rename to setuptools-0.6c16dev2.egg/EGG-INFO/entry_points.txt
diff --git a/setuptools-0.6c16dev.egg/EGG-INFO/top_level.txt b/setuptools-0.6c16dev2.egg/EGG-INFO/top_level.txt
similarity index 100%
rename from setuptools-0.6c16dev.egg/EGG-INFO/top_level.txt
rename to setuptools-0.6c16dev2.egg/EGG-INFO/top_level.txt
diff --git a/setuptools-0.6c16dev.egg/EGG-INFO/zip-safe b/setuptools-0.6c16dev2.egg/EGG-INFO/zip-safe
similarity index 100%
rename from setuptools-0.6c16dev.egg/EGG-INFO/zip-safe
rename to setuptools-0.6c16dev2.egg/EGG-INFO/zip-safe
diff --git a/setuptools-0.6c16dev.egg/easy_install.py b/setuptools-0.6c16dev2.egg/easy_install.py
similarity index 100%
rename from setuptools-0.6c16dev.egg/easy_install.py
rename to setuptools-0.6c16dev2.egg/easy_install.py
diff --git a/setuptools-0.6c16dev.egg/pkg_resources.py b/setuptools-0.6c16dev2.egg/pkg_resources.py
similarity index 100%
rename from setuptools-0.6c16dev.egg/pkg_resources.py
rename to setuptools-0.6c16dev2.egg/pkg_resources.py
diff --git a/setuptools-0.6c16dev.egg/setuptools/__init__.py b/setuptools-0.6c16dev2.egg/setuptools/__init__.py
similarity index 89%
rename from setuptools-0.6c16dev.egg/setuptools/__init__.py
rename to setuptools-0.6c16dev2.egg/setuptools/__init__.py
index 64845f66..8ab1a2bf 100644
--- a/setuptools-0.6c16dev.egg/setuptools/__init__.py
+++ b/setuptools-0.6c16dev2.egg/setuptools/__init__.py
@@ -6,8 +6,10 @@ from setuptools.depends import Require
 from distutils.core import Command as _Command
 from distutils.util import convert_path
 import os.path
+import os
+import sys
 
-__version__ = '0.6c16dev'
+__version__ = '0.6c16dev2'
 __all__ = [
     'setup', 'Distribution', 'Feature', 'Command', 'Extension', 'Require',
     'find_packages'
@@ -80,3 +82,9 @@ import distutils.filelist
 distutils.filelist.findall = findall    # fix findall bug in distutils.
 
 
+# sys.dont_write_bytecode was introduced in Python 2.6.
+if ((hasattr(sys, "dont_write_bytecode") and sys.dont_write_bytecode) or
+    (not hasattr(sys, "dont_write_bytecode") and os.environ.get("PYTHONDONTWRITEBYTECODE"))):
+    _dont_write_bytecode = True
+else:
+    _dont_write_bytecode = False
diff --git a/setuptools-0.6c16dev.egg/setuptools/archive_util.py b/setuptools-0.6c16dev2.egg/setuptools/archive_util.py
similarity index 100%
rename from setuptools-0.6c16dev.egg/setuptools/archive_util.py
rename to setuptools-0.6c16dev2.egg/setuptools/archive_util.py
diff --git a/setuptools-0.6c16dev.egg/setuptools/command/__init__.py b/setuptools-0.6c16dev2.egg/setuptools/command/__init__.py
similarity index 100%
rename from setuptools-0.6c16dev.egg/setuptools/command/__init__.py
rename to setuptools-0.6c16dev2.egg/setuptools/command/__init__.py
diff --git a/setuptools-0.6c16dev.egg/setuptools/command/alias.py b/setuptools-0.6c16dev2.egg/setuptools/command/alias.py
similarity index 100%
rename from setuptools-0.6c16dev.egg/setuptools/command/alias.py
rename to setuptools-0.6c16dev2.egg/setuptools/command/alias.py
diff --git a/setuptools-0.6c16dev.egg/setuptools/command/bdist_egg.py b/setuptools-0.6c16dev2.egg/setuptools/command/bdist_egg.py
similarity index 100%
rename from setuptools-0.6c16dev.egg/setuptools/command/bdist_egg.py
rename to setuptools-0.6c16dev2.egg/setuptools/command/bdist_egg.py
diff --git a/setuptools-0.6c16dev.egg/setuptools/command/bdist_rpm.py b/setuptools-0.6c16dev2.egg/setuptools/command/bdist_rpm.py
similarity index 100%
rename from setuptools-0.6c16dev.egg/setuptools/command/bdist_rpm.py
rename to setuptools-0.6c16dev2.egg/setuptools/command/bdist_rpm.py
diff --git a/setuptools-0.6c16dev.egg/setuptools/command/bdist_wininst.py b/setuptools-0.6c16dev2.egg/setuptools/command/bdist_wininst.py
similarity index 100%
rename from setuptools-0.6c16dev.egg/setuptools/command/bdist_wininst.py
rename to setuptools-0.6c16dev2.egg/setuptools/command/bdist_wininst.py
diff --git a/setuptools-0.6c16dev.egg/setuptools/command/build_ext.py b/setuptools-0.6c16dev2.egg/setuptools/command/build_ext.py
similarity index 100%
rename from setuptools-0.6c16dev.egg/setuptools/command/build_ext.py
rename to setuptools-0.6c16dev2.egg/setuptools/command/build_ext.py
diff --git a/setuptools-0.6c16dev.egg/setuptools/command/build_py.py b/setuptools-0.6c16dev2.egg/setuptools/command/build_py.py
similarity index 100%
rename from setuptools-0.6c16dev.egg/setuptools/command/build_py.py
rename to setuptools-0.6c16dev2.egg/setuptools/command/build_py.py
diff --git a/setuptools-0.6c16dev.egg/setuptools/command/develop.py b/setuptools-0.6c16dev2.egg/setuptools/command/develop.py
similarity index 100%
rename from setuptools-0.6c16dev.egg/setuptools/command/develop.py
rename to setuptools-0.6c16dev2.egg/setuptools/command/develop.py
diff --git a/setuptools-0.6c16dev.egg/setuptools/command/easy_install.py b/setuptools-0.6c16dev2.egg/setuptools/command/easy_install.py
similarity index 99%
rename from setuptools-0.6c16dev.egg/setuptools/command/easy_install.py
rename to setuptools-0.6c16dev2.egg/setuptools/command/easy_install.py
index da296d94..a9be3fa3 100644
--- a/setuptools-0.6c16dev.egg/setuptools/command/easy_install.py
+++ b/setuptools-0.6c16dev2.egg/setuptools/command/easy_install.py
@@ -11,7 +11,7 @@ __ http://peak.telecommunity.com/DevCenter/EasyInstall
 """
 import sys, os.path, zipimport, shutil, tempfile, zipfile, re, stat, random
 from glob import glob
-from setuptools import Command
+from setuptools import Command, _dont_write_bytecode
 from setuptools import __version__ as setuptools_version
 from setuptools.sandbox import run_setup
 from distutils import log, dir_util
@@ -1008,6 +1008,9 @@ See the setuptools documentation for the "develop" command for more info.
                 chmod(f, mode)
 
     def byte_compile(self, to_compile):
+        if _dont_write_bytecode:
+            self.warn('byte-compiling is disabled, skipping.')
+            return
         from distutils.util import byte_compile
         try:
             # try to make the byte compile messages quieter
diff --git a/setuptools-0.6c16dev.egg/setuptools/command/egg_info.py b/setuptools-0.6c16dev2.egg/setuptools/command/egg_info.py
similarity index 100%
rename from setuptools-0.6c16dev.egg/setuptools/command/egg_info.py
rename to setuptools-0.6c16dev2.egg/setuptools/command/egg_info.py
diff --git a/setuptools-0.6c16dev.egg/setuptools/command/install.py b/setuptools-0.6c16dev2.egg/setuptools/command/install.py
similarity index 100%
rename from setuptools-0.6c16dev.egg/setuptools/command/install.py
rename to setuptools-0.6c16dev2.egg/setuptools/command/install.py
diff --git a/setuptools-0.6c16dev.egg/setuptools/command/install_egg_info.py b/setuptools-0.6c16dev2.egg/setuptools/command/install_egg_info.py
similarity index 100%
rename from setuptools-0.6c16dev.egg/setuptools/command/install_egg_info.py
rename to setuptools-0.6c16dev2.egg/setuptools/command/install_egg_info.py
diff --git a/setuptools-0.6c16dev.egg/setuptools/command/install_lib.py b/setuptools-0.6c16dev2.egg/setuptools/command/install_lib.py
similarity index 100%
rename from setuptools-0.6c16dev.egg/setuptools/command/install_lib.py
rename to setuptools-0.6c16dev2.egg/setuptools/command/install_lib.py
diff --git a/setuptools-0.6c16dev.egg/setuptools/command/install_scripts.py b/setuptools-0.6c16dev2.egg/setuptools/command/install_scripts.py
similarity index 100%
rename from setuptools-0.6c16dev.egg/setuptools/command/install_scripts.py
rename to setuptools-0.6c16dev2.egg/setuptools/command/install_scripts.py
diff --git a/setuptools-0.6c16dev.egg/setuptools/command/register.py b/setuptools-0.6c16dev2.egg/setuptools/command/register.py
similarity index 100%
rename from setuptools-0.6c16dev.egg/setuptools/command/register.py
rename to setuptools-0.6c16dev2.egg/setuptools/command/register.py
diff --git a/setuptools-0.6c16dev.egg/setuptools/command/rotate.py b/setuptools-0.6c16dev2.egg/setuptools/command/rotate.py
similarity index 100%
rename from setuptools-0.6c16dev.egg/setuptools/command/rotate.py
rename to setuptools-0.6c16dev2.egg/setuptools/command/rotate.py
diff --git a/setuptools-0.6c16dev.egg/setuptools/command/saveopts.py b/setuptools-0.6c16dev2.egg/setuptools/command/saveopts.py
similarity index 100%
rename from setuptools-0.6c16dev.egg/setuptools/command/saveopts.py
rename to setuptools-0.6c16dev2.egg/setuptools/command/saveopts.py
diff --git a/setuptools-0.6c16dev.egg/setuptools/command/scriptsetup.py b/setuptools-0.6c16dev2.egg/setuptools/command/scriptsetup.py
similarity index 100%
rename from setuptools-0.6c16dev.egg/setuptools/command/scriptsetup.py
rename to setuptools-0.6c16dev2.egg/setuptools/command/scriptsetup.py
diff --git a/setuptools-0.6c16dev.egg/setuptools/command/sdist.py b/setuptools-0.6c16dev2.egg/setuptools/command/sdist.py
similarity index 100%
rename from setuptools-0.6c16dev.egg/setuptools/command/sdist.py
rename to setuptools-0.6c16dev2.egg/setuptools/command/sdist.py
diff --git a/setuptools-0.6c16dev.egg/setuptools/command/setopt.py b/setuptools-0.6c16dev2.egg/setuptools/command/setopt.py
similarity index 100%
rename from setuptools-0.6c16dev.egg/setuptools/command/setopt.py
rename to setuptools-0.6c16dev2.egg/setuptools/command/setopt.py
diff --git a/setuptools-0.6c16dev.egg/setuptools/command/test.py b/setuptools-0.6c16dev2.egg/setuptools/command/test.py
similarity index 100%
rename from setuptools-0.6c16dev.egg/setuptools/command/test.py
rename to setuptools-0.6c16dev2.egg/setuptools/command/test.py
diff --git a/setuptools-0.6c16dev.egg/setuptools/command/upload.py b/setuptools-0.6c16dev2.egg/setuptools/command/upload.py
similarity index 100%
rename from setuptools-0.6c16dev.egg/setuptools/command/upload.py
rename to setuptools-0.6c16dev2.egg/setuptools/command/upload.py
diff --git a/setuptools-0.6c16dev.egg/setuptools/depends.py b/setuptools-0.6c16dev2.egg/setuptools/depends.py
similarity index 100%
rename from setuptools-0.6c16dev.egg/setuptools/depends.py
rename to setuptools-0.6c16dev2.egg/setuptools/depends.py
diff --git a/setuptools-0.6c16dev.egg/setuptools/dist.py b/setuptools-0.6c16dev2.egg/setuptools/dist.py
similarity index 100%
rename from setuptools-0.6c16dev.egg/setuptools/dist.py
rename to setuptools-0.6c16dev2.egg/setuptools/dist.py
diff --git a/setuptools-0.6c16dev.egg/setuptools/extension.py b/setuptools-0.6c16dev2.egg/setuptools/extension.py
similarity index 100%
rename from setuptools-0.6c16dev.egg/setuptools/extension.py
rename to setuptools-0.6c16dev2.egg/setuptools/extension.py
diff --git a/setuptools-0.6c16dev.egg/setuptools/package_index.py b/setuptools-0.6c16dev2.egg/setuptools/package_index.py
similarity index 100%
rename from setuptools-0.6c16dev.egg/setuptools/package_index.py
rename to setuptools-0.6c16dev2.egg/setuptools/package_index.py
diff --git a/setuptools-0.6c16dev.egg/setuptools/sandbox.py b/setuptools-0.6c16dev2.egg/setuptools/sandbox.py
similarity index 100%
rename from setuptools-0.6c16dev.egg/setuptools/sandbox.py
rename to setuptools-0.6c16dev2.egg/setuptools/sandbox.py
diff --git a/setuptools-0.6c16dev.egg/setuptools/site-patch.py b/setuptools-0.6c16dev2.egg/setuptools/site-patch.py
similarity index 100%
rename from setuptools-0.6c16dev.egg/setuptools/site-patch.py
rename to setuptools-0.6c16dev2.egg/setuptools/site-patch.py
diff --git a/setuptools-0.6c16dev.egg/setuptools/tests/__init__.py b/setuptools-0.6c16dev2.egg/setuptools/tests/__init__.py
similarity index 100%
rename from setuptools-0.6c16dev.egg/setuptools/tests/__init__.py
rename to setuptools-0.6c16dev2.egg/setuptools/tests/__init__.py
diff --git a/setuptools-0.6c16dev.egg/setuptools/tests/test_packageindex.py b/setuptools-0.6c16dev2.egg/setuptools/tests/test_packageindex.py
similarity index 100%
rename from setuptools-0.6c16dev.egg/setuptools/tests/test_packageindex.py
rename to setuptools-0.6c16dev2.egg/setuptools/tests/test_packageindex.py
diff --git a/setuptools-0.6c16dev.egg/setuptools/tests/test_resources.py b/setuptools-0.6c16dev2.egg/setuptools/tests/test_resources.py
similarity index 100%
rename from setuptools-0.6c16dev.egg/setuptools/tests/test_resources.py
rename to setuptools-0.6c16dev2.egg/setuptools/tests/test_resources.py
diff --git a/setuptools-0.6c16dev.egg/zetuptoolz.txt b/setuptools-0.6c16dev2.egg/zetuptoolz.txt
similarity index 100%
rename from setuptools-0.6c16dev.egg/zetuptoolz.txt
rename to setuptools-0.6c16dev2.egg/zetuptoolz.txt
-- 
2.45.2