From c045241a5505684831f7c0fed74f94e8ec0a7e8e Mon Sep 17 00:00:00 2001
From: david-sarah <david-sarah@jacaranda.org>
Date: Sun, 1 Aug 2010 23:06:02 -0700
Subject: [PATCH] Bundle setuptools-0.6c16dev (with Windows script changes, and
 the change to only warn if site.py wasn't generated by setuptools) instead of
 0.6c15dev. addresses #565, #1073, #1074

---
 setuptools-0.6c15dev.egg/EGG-INFO/PKG-INFO    | 183 ------------------
 setuptools-0.6c15dev.egg/setuptools/cli.exe   | Bin 6656 -> 0 bytes
 setuptools-0.6c16dev.egg/EGG-INFO/PKG-INFO    | 100 ++++++++++
 .../EGG-INFO/SOURCES.txt                      |   1 +
 .../EGG-INFO/dependency_links.txt             |   0
 .../EGG-INFO/entry_points.txt                 |   5 +-
 .../EGG-INFO/top_level.txt                    |   0
 .../EGG-INFO/zip-safe                         |   0
 .../easy_install.py                           |   0
 .../pkg_resources.py                          |   2 +-
 .../setuptools/__init__.py                    |   2 +-
 .../setuptools/archive_util.py                |   0
 .../setuptools/command/__init__.py            |   2 +-
 .../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            |   6 +
 .../setuptools/command/develop.py             |   0
 .../setuptools/command/easy_install.py        | 133 ++++++-------
 .../setuptools/command/egg_info.py            |   0
 .../setuptools/command/install.py             |  12 +-
 .../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/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
 setuptools-0.6c16dev.egg/zetuptoolz.txt       |  84 ++++++++
 43 files changed, 271 insertions(+), 259 deletions(-)
 delete mode 100644 setuptools-0.6c15dev.egg/EGG-INFO/PKG-INFO
 delete mode 100644 setuptools-0.6c15dev.egg/setuptools/cli.exe
 create mode 100644 setuptools-0.6c16dev.egg/EGG-INFO/PKG-INFO
 rename {setuptools-0.6c15dev.egg => setuptools-0.6c16dev.egg}/EGG-INFO/SOURCES.txt (97%)
 rename {setuptools-0.6c15dev.egg => setuptools-0.6c16dev.egg}/EGG-INFO/dependency_links.txt (100%)
 rename {setuptools-0.6c15dev.egg => setuptools-0.6c16dev.egg}/EGG-INFO/entry_points.txt (93%)
 rename {setuptools-0.6c15dev.egg => setuptools-0.6c16dev.egg}/EGG-INFO/top_level.txt (100%)
 rename {setuptools-0.6c15dev.egg => setuptools-0.6c16dev.egg}/EGG-INFO/zip-safe (100%)
 rename {setuptools-0.6c15dev.egg => setuptools-0.6c16dev.egg}/easy_install.py (100%)
 rename {setuptools-0.6c15dev.egg => setuptools-0.6c16dev.egg}/pkg_resources.py (99%)
 rename {setuptools-0.6c15dev.egg => setuptools-0.6c16dev.egg}/setuptools/__init__.py (99%)
 rename {setuptools-0.6c15dev.egg => setuptools-0.6c16dev.egg}/setuptools/archive_util.py (100%)
 rename {setuptools-0.6c15dev.egg => setuptools-0.6c16dev.egg}/setuptools/command/__init__.py (92%)
 rename {setuptools-0.6c15dev.egg => setuptools-0.6c16dev.egg}/setuptools/command/alias.py (100%)
 rename {setuptools-0.6c15dev.egg => setuptools-0.6c16dev.egg}/setuptools/command/bdist_egg.py (100%)
 rename {setuptools-0.6c15dev.egg => setuptools-0.6c16dev.egg}/setuptools/command/bdist_rpm.py (100%)
 rename {setuptools-0.6c15dev.egg => setuptools-0.6c16dev.egg}/setuptools/command/bdist_wininst.py (100%)
 rename {setuptools-0.6c15dev.egg => setuptools-0.6c16dev.egg}/setuptools/command/build_ext.py (100%)
 rename {setuptools-0.6c15dev.egg => setuptools-0.6c16dev.egg}/setuptools/command/build_py.py (97%)
 rename {setuptools-0.6c15dev.egg => setuptools-0.6c16dev.egg}/setuptools/command/develop.py (100%)
 rename {setuptools-0.6c15dev.egg => setuptools-0.6c16dev.egg}/setuptools/command/easy_install.py (94%)
 rename {setuptools-0.6c15dev.egg => setuptools-0.6c16dev.egg}/setuptools/command/egg_info.py (100%)
 rename {setuptools-0.6c15dev.egg => setuptools-0.6c16dev.egg}/setuptools/command/install.py (95%)
 rename {setuptools-0.6c15dev.egg => setuptools-0.6c16dev.egg}/setuptools/command/install_egg_info.py (100%)
 rename {setuptools-0.6c15dev.egg => setuptools-0.6c16dev.egg}/setuptools/command/install_lib.py (100%)
 rename {setuptools-0.6c15dev.egg => setuptools-0.6c16dev.egg}/setuptools/command/install_scripts.py (100%)
 rename {setuptools-0.6c15dev.egg => setuptools-0.6c16dev.egg}/setuptools/command/register.py (100%)
 rename {setuptools-0.6c15dev.egg => setuptools-0.6c16dev.egg}/setuptools/command/rotate.py (100%)
 rename {setuptools-0.6c15dev.egg => setuptools-0.6c16dev.egg}/setuptools/command/saveopts.py (100%)
 rename {setuptools-0.6c15dev.egg => setuptools-0.6c16dev.egg}/setuptools/command/sdist.py (100%)
 rename {setuptools-0.6c15dev.egg => setuptools-0.6c16dev.egg}/setuptools/command/setopt.py (100%)
 rename {setuptools-0.6c15dev.egg => setuptools-0.6c16dev.egg}/setuptools/command/test.py (100%)
 rename {setuptools-0.6c15dev.egg => setuptools-0.6c16dev.egg}/setuptools/command/upload.py (100%)
 rename {setuptools-0.6c15dev.egg => setuptools-0.6c16dev.egg}/setuptools/depends.py (100%)
 rename {setuptools-0.6c15dev.egg => setuptools-0.6c16dev.egg}/setuptools/dist.py (100%)
 rename {setuptools-0.6c15dev.egg => setuptools-0.6c16dev.egg}/setuptools/extension.py (100%)
 rename {setuptools-0.6c15dev.egg => setuptools-0.6c16dev.egg}/setuptools/package_index.py (100%)
 rename {setuptools-0.6c15dev.egg => setuptools-0.6c16dev.egg}/setuptools/sandbox.py (100%)
 rename {setuptools-0.6c15dev.egg => setuptools-0.6c16dev.egg}/setuptools/site-patch.py (100%)
 rename {setuptools-0.6c15dev.egg => setuptools-0.6c16dev.egg}/setuptools/tests/__init__.py (100%)
 rename {setuptools-0.6c15dev.egg => setuptools-0.6c16dev.egg}/setuptools/tests/test_packageindex.py (100%)
 rename {setuptools-0.6c15dev.egg => setuptools-0.6c16dev.egg}/setuptools/tests/test_resources.py (100%)
 create mode 100644 setuptools-0.6c16dev.egg/zetuptoolz.txt

diff --git a/setuptools-0.6c15dev.egg/EGG-INFO/PKG-INFO b/setuptools-0.6c15dev.egg/EGG-INFO/PKG-INFO
deleted file mode 100644
index 019cb4c6..00000000
--- a/setuptools-0.6c15dev.egg/EGG-INFO/PKG-INFO
+++ /dev/null
@@ -1,183 +0,0 @@
-Metadata-Version: 1.0
-Name: setuptools
-Version: 0.6c15dev
-Summary: Download, build, install, upgrade, and uninstall Python packages -- easily!
-Home-page: http://pypi.python.org/pypi/setuptools
-Author: Phillip J. Eby
-Author-email: distutils-sig@python.org
-License: PSF or ZPL
-Description: ===============================
-        Installing and Using Setuptools
-        ===============================
-        
-        .. contents:: **Table of Contents**
-        
-        
-        -------------------------
-        Installation Instructions
-        -------------------------
-        
-        Windows
-        =======
-        
-        Install setuptools using the provided ``.exe`` installer.  If you've previously
-        installed older versions of setuptools, please delete all ``setuptools*.egg``
-        and ``setuptools.pth`` files from your system's ``site-packages`` directory
-        (and any other ``sys.path`` directories) FIRST.
-        
-        If you are upgrading a previous version of setuptools that was installed using
-        an ``.exe`` installer, please be sure to also *uninstall that older version*
-        via your system's "Add/Remove Programs" feature, BEFORE installing the newer
-        version.
-        
-        Once installation is complete, you will find an ``easy_install.exe`` program in
-        your Python ``Scripts`` subdirectory.  Be sure to add this directory to your
-        ``PATH`` environment variable, if you haven't already done so.
-        
-        
-        RPM-Based Systems
-        =================
-        
-        Install setuptools using the provided source RPM.  The included ``.spec`` file
-        assumes you are installing using the default ``python`` executable, and is not
-        specific to a particular Python version.  The ``easy_install`` executable will
-        be installed to a system ``bin`` directory such as ``/usr/bin``.
-        
-        If you wish to install to a location other than the default Python
-        installation's default ``site-packages`` directory (and ``$prefix/bin`` for
-        scripts), please use the ``.egg``-based installation approach described in the
-        following section.
-        
-        
-        Cygwin, Mac OS X, Linux, Other
-        ==============================
-        
-        1. Download the appropriate egg for your version of Python (e.g.
-        ``setuptools-0.6c9-py2.4.egg``).  Do NOT rename it.
-        
-        2. Run it as if it were a shell script, e.g. ``sh setuptools-0.6c9-py2.4.egg``.
-        Setuptools will install itself using the matching version of Python (e.g.
-        ``python2.4``), and will place the ``easy_install`` executable in the
-        default location for installing Python scripts (as determined by the
-        standard distutils configuration files, or by the Python installation).
-        
-        If you want to install setuptools to somewhere other than ``site-packages`` or
-        your default distutils installation locations for libraries and scripts, you
-        may include EasyInstall command-line options such as ``--prefix``,
-        ``--install-dir``, and so on, following the ``.egg`` filename on the same
-        command line.  For example::
-        
-        sh setuptools-0.6c9-py2.4.egg --prefix=~
-        
-        You can use ``--help`` to get a full options list, but we recommend consulting
-        the `EasyInstall manual`_ for detailed instructions, especially `the section
-        on custom installation locations`_.
-        
-        .. _EasyInstall manual: http://peak.telecommunity.com/DevCenter/EasyInstall
-        .. _the section on custom installation locations: http://peak.telecommunity.com/DevCenter/EasyInstall#custom-installation-locations
-        
-        
-        Cygwin Note
-        -----------
-        
-        If you are trying to install setuptools for the **Windows** version of Python
-        (as opposed to the Cygwin version that lives in ``/usr/bin``), you must make
-        sure that an appropriate executable (``python2.3``, ``python2.4``, or
-        ``python2.5``) is on your **Cygwin** ``PATH`` when invoking the egg.  For
-        example, doing the following at a Cygwin bash prompt will install setuptools
-        for the **Windows** Python found at ``C:\\Python24``::
-        
-        ln -s /cygdrive/c/Python24/python.exe python2.4
-        PATH=.:$PATH sh setuptools-0.6c9-py2.4.egg
-        rm python2.4
-        
-        
-        Downloads
-        =========
-        
-        All setuptools downloads can be found at `the project's home page in the Python
-        Package Index`_.  Scroll to the very bottom of the page to find the links.
-        
-        .. _the project's home page in the Python Package Index: http://pypi.python.org/pypi/setuptools#files
-        
-        In addition to the PyPI downloads, the development version of ``setuptools``
-        is available from the `Python SVN sandbox`_, and in-development versions of the
-        `0.6 branch`_ are available as well.
-        
-        .. _0.6 branch: http://svn.python.org/projects/sandbox/branches/setuptools-0.6/#egg=setuptools-dev06
-        
-        .. _Python SVN sandbox: http://svn.python.org/projects/sandbox/trunk/setuptools/#egg=setuptools-dev
-        
-        --------------------------------
-        Using Setuptools and EasyInstall
-        --------------------------------
-        
-        Here are some of the available manuals, tutorials, and other resources for
-        learning about Setuptools, Python Eggs, and EasyInstall:
-        
-        * `The EasyInstall user's guide and reference manual`_
-        * `The setuptools Developer's Guide`_
-        * `The pkg_resources API reference`_
-        * `Package Compatibility Notes`_ (user-maintained)
-        * `The Internal Structure of Python Eggs`_
-        
-        Questions, comments, and bug reports should be directed to the `distutils-sig
-        mailing list`_.  If you have written (or know of) any tutorials, documentation,
-        plug-ins, or other resources for setuptools users, please let us know about
-        them there, so this reference list can be updated.  If you have working,
-        *tested* patches to correct problems or add features, you may submit them to
-        the `setuptools bug tracker`_.
-        
-        .. _setuptools bug tracker: http://bugs.python.org/setuptools/
-        .. _Package Compatibility Notes: http://peak.telecommunity.com/DevCenter/PackageNotes
-        .. _The Internal Structure of Python Eggs: http://peak.telecommunity.com/DevCenter/EggFormats
-        .. _The setuptools Developer's Guide: http://peak.telecommunity.com/DevCenter/setuptools
-        .. _The pkg_resources API reference: http://peak.telecommunity.com/DevCenter/PkgResources
-        .. _The EasyInstall user's guide and reference manual: http://peak.telecommunity.com/DevCenter/EasyInstall
-        .. _distutils-sig mailing list: http://mail.python.org/pipermail/distutils-sig/
-        
-        
-        -------
-        Credits
-        -------
-        
-        * The original design for the ``.egg`` format and the ``pkg_resources`` API was
-        co-created by Phillip Eby and Bob Ippolito.  Bob also implemented the first
-        version of ``pkg_resources``, and supplied the OS X operating system version
-        compatibility algorithm.
-        
-        * Ian Bicking implemented many early "creature comfort" features of
-        easy_install, including support for downloading via Sourceforge and
-        Subversion repositories.  Ian's comments on the Web-SIG about WSGI
-        application deployment also inspired the concept of "entry points" in eggs,
-        and he has given talks at PyCon and elsewhere to inform and educate the
-        community about eggs and setuptools.
-        
-        * Jim Fulton contributed time and effort to build automated tests of various
-        aspects of ``easy_install``, and supplied the doctests for the command-line
-        ``.exe`` wrappers on Windows.
-        
-        * Phillip J. Eby is the principal author and maintainer of setuptools, and
-        first proposed the idea of an importable binary distribution format for
-        Python application plug-ins.
-        
-        * Significant parts of the implementation of setuptools were funded by the Open
-        Source Applications Foundation, to provide a plug-in infrastructure for the
-        Chandler PIM application.  In addition, many OSAF staffers (such as Mike
-        "Code Bear" Taylor) contributed their time and stress as guinea pigs for the
-        use of eggs and setuptools, even before eggs were "cool".  (Thanks, guys!)
-        
-        .. _files:
-        
-Keywords: CPAN PyPI distutils eggs package management
-Platform: UNKNOWN
-Classifier: Development Status :: 3 - Alpha
-Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: Python Software Foundation License
-Classifier: License :: OSI Approved :: Zope Public License
-Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python
-Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Classifier: Topic :: System :: Archiving :: Packaging
-Classifier: Topic :: System :: Systems Administration
-Classifier: Topic :: Utilities
diff --git a/setuptools-0.6c15dev.egg/setuptools/cli.exe b/setuptools-0.6c15dev.egg/setuptools/cli.exe
deleted file mode 100644
index 3173b2b21dd54f1008d0a1046418eefb5f9c2989..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6656
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
UXq{){dQbD+cNwb_z<<B}1906e#{d8T

diff --git a/setuptools-0.6c16dev.egg/EGG-INFO/PKG-INFO b/setuptools-0.6c16dev.egg/EGG-INFO/PKG-INFO
new file mode 100644
index 00000000..1eed5ffd
--- /dev/null
+++ b/setuptools-0.6c16dev.egg/EGG-INFO/PKG-INFO
@@ -0,0 +1,100 @@
+Metadata-Version: 1.0
+Name: setuptools
+Version: 0.6c16dev
+Summary: Download, build, install, upgrade, and uninstall Python packages -- easily!  (zetuptoolz fork)
+Home-page: http://pypi.python.org/pypi/setuptools
+Author: Phillip J. Eby
+Author-email: distutils-sig@python.org
+License: PSF or ZPL
+Description: ======================
+        This is not Setuptools
+        ======================
+        
+        This is the ``zetuptoolz`` fork of setuptools, which is used to install
+        `Tahoe-LAFS`_. It has a `darcs source repository`_ and `issue tracker`_.
+        
+        For a list of differences between this fork and setuptools, see zetuptoolz.txt.
+        
+        Note that, to avoid interfering with any setuptools installation, zetuptoolz
+        does not install a script called ``easy_install``. There is an ``easy_install_z``
+        script, but that is intended only for developers to test differences between
+        setuptools and zetuptoolz.
+        
+        .. _Tahoe-LAFS: http://tahoe-lafs.org/
+        .. _darcs source repository: http://tahoe-lafs.org/source/zetuptoolz/trunk
+        .. _issue tracker: http://tahoe-lafs.org/trac/zetuptoolz
+        
+        
+        --------------------------------
+        Using Setuptools and EasyInstall
+        --------------------------------
+        
+        Here are some of the available manuals, tutorials, and other resources for
+        learning about Setuptools, Python Eggs, and EasyInstall:
+        
+        * `The EasyInstall user's guide and reference manual`_
+        * `The setuptools Developer's Guide`_
+        * `The pkg_resources API reference`_
+        * `Package Compatibility Notes`_ (user-maintained)
+        * `The Internal Structure of Python Eggs`_
+        
+        Questions, comments, and bug reports should be directed to the `distutils-sig
+        mailing list`_.  If you have written (or know of) any tutorials, documentation,
+        plug-ins, or other resources for setuptools users, please let us know about
+        them there, so this reference list can be updated.  If you have working,
+        *tested* patches to correct problems or add features, you may submit them to
+        the `setuptools bug tracker`_.
+        
+        .. _setuptools bug tracker: http://bugs.python.org/setuptools/
+        .. _Package Compatibility Notes: http://peak.telecommunity.com/DevCenter/PackageNotes
+        .. _The Internal Structure of Python Eggs: http://peak.telecommunity.com/DevCenter/EggFormats
+        .. _The setuptools Developer's Guide: http://peak.telecommunity.com/DevCenter/setuptools
+        .. _The pkg_resources API reference: http://peak.telecommunity.com/DevCenter/PkgResources
+        .. _The EasyInstall user's guide and reference manual: http://peak.telecommunity.com/DevCenter/EasyInstall
+        .. _distutils-sig mailing list: http://mail.python.org/pipermail/distutils-sig/
+        
+        
+        -------
+        Credits
+        -------
+        
+        * The original design for the ``.egg`` format and the ``pkg_resources`` API was
+        co-created by Phillip Eby and Bob Ippolito.  Bob also implemented the first
+        version of ``pkg_resources``, and supplied the OS X operating system version
+        compatibility algorithm.
+        
+        * Ian Bicking implemented many early "creature comfort" features of
+        easy_install, including support for downloading via Sourceforge and
+        Subversion repositories.  Ian's comments on the Web-SIG about WSGI
+        application deployment also inspired the concept of "entry points" in eggs,
+        and he has given talks at PyCon and elsewhere to inform and educate the
+        community about eggs and setuptools.
+        
+        * Jim Fulton contributed time and effort to build automated tests of various
+        aspects of ``easy_install``, and supplied the doctests for the command-line
+        ``.exe`` wrappers on Windows.
+        
+        * Phillip J. Eby is the principal author and maintainer of setuptools, and
+        first proposed the idea of an importable binary distribution format for
+        Python application plug-ins.
+        
+        * Significant parts of the implementation of setuptools were funded by the Open
+        Source Applications Foundation, to provide a plug-in infrastructure for the
+        Chandler PIM application.  In addition, many OSAF staffers (such as Mike
+        "Code Bear" Taylor) contributed their time and stress as guinea pigs for the
+        use of eggs and setuptools, even before eggs were "cool".  (Thanks, guys!)
+        
+        .. _files:
+        
+Keywords: CPAN PyPI distutils eggs package management
+Platform: UNKNOWN
+Classifier: Development Status :: 3 - Alpha
+Classifier: Intended Audience :: Developers
+Classifier: License :: OSI Approved :: Python Software Foundation License
+Classifier: License :: OSI Approved :: Zope Public License
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python
+Classifier: Topic :: Software Development :: Libraries :: Python Modules
+Classifier: Topic :: System :: Archiving :: Packaging
+Classifier: Topic :: System :: Systems Administration
+Classifier: Topic :: Utilities
diff --git a/setuptools-0.6c15dev.egg/EGG-INFO/SOURCES.txt b/setuptools-0.6c16dev.egg/EGG-INFO/SOURCES.txt
similarity index 97%
rename from setuptools-0.6c15dev.egg/EGG-INFO/SOURCES.txt
rename to setuptools-0.6c16dev.egg/EGG-INFO/SOURCES.txt
index 74f5d2be..07bd4ff5 100644
--- a/setuptools-0.6c15dev.egg/EGG-INFO/SOURCES.txt
+++ b/setuptools-0.6c16dev.egg/EGG-INFO/SOURCES.txt
@@ -34,6 +34,7 @@ setuptools/command/install_scripts.py
 setuptools/command/register.py
 setuptools/command/rotate.py
 setuptools/command/saveopts.py
+setuptools/command/scriptsetup.py
 setuptools/command/sdist.py
 setuptools/command/setopt.py
 setuptools/command/test.py
diff --git a/setuptools-0.6c15dev.egg/EGG-INFO/dependency_links.txt b/setuptools-0.6c16dev.egg/EGG-INFO/dependency_links.txt
similarity index 100%
rename from setuptools-0.6c15dev.egg/EGG-INFO/dependency_links.txt
rename to setuptools-0.6c16dev.egg/EGG-INFO/dependency_links.txt
diff --git a/setuptools-0.6c15dev.egg/EGG-INFO/entry_points.txt b/setuptools-0.6c16dev.egg/EGG-INFO/entry_points.txt
similarity index 93%
rename from setuptools-0.6c15dev.egg/EGG-INFO/entry_points.txt
rename to setuptools-0.6c16dev.egg/EGG-INFO/entry_points.txt
index 07d362c9..0a31ba07 100644
--- a/setuptools-0.6c15dev.egg/EGG-INFO/entry_points.txt
+++ b/setuptools-0.6c16dev.egg/EGG-INFO/entry_points.txt
@@ -4,6 +4,7 @@ rotate = setuptools.command.rotate:rotate
 develop = setuptools.command.develop:develop
 setopt = setuptools.command.setopt:setopt
 build_py = setuptools.command.build_py:build_py
+scriptsetup = setuptools.command.scriptsetup:scriptsetup
 saveopts = setuptools.command.saveopts:saveopts
 egg_info = setuptools.command.egg_info:egg_info
 register = setuptools.command.register:register
@@ -30,8 +31,8 @@ entry_points.txt = setuptools.command.egg_info:write_entries
 depends.txt = setuptools.command.egg_info:warn_depends_obsolete
 
 [console_scripts]
-easy_install = setuptools.command.easy_install:main
-easy_install-2.5 = setuptools.command.easy_install:main
+easy_install_z-2.6 = setuptools.command.easy_install:main
+easy_install_z = setuptools.command.easy_install:main
 
 [setuptools.file_finders]
 svn_cvs = setuptools.command.sdist:_default_revctrl
diff --git a/setuptools-0.6c15dev.egg/EGG-INFO/top_level.txt b/setuptools-0.6c16dev.egg/EGG-INFO/top_level.txt
similarity index 100%
rename from setuptools-0.6c15dev.egg/EGG-INFO/top_level.txt
rename to setuptools-0.6c16dev.egg/EGG-INFO/top_level.txt
diff --git a/setuptools-0.6c15dev.egg/EGG-INFO/zip-safe b/setuptools-0.6c16dev.egg/EGG-INFO/zip-safe
similarity index 100%
rename from setuptools-0.6c15dev.egg/EGG-INFO/zip-safe
rename to setuptools-0.6c16dev.egg/EGG-INFO/zip-safe
diff --git a/setuptools-0.6c15dev.egg/easy_install.py b/setuptools-0.6c16dev.egg/easy_install.py
similarity index 100%
rename from setuptools-0.6c15dev.egg/easy_install.py
rename to setuptools-0.6c16dev.egg/easy_install.py
diff --git a/setuptools-0.6c15dev.egg/pkg_resources.py b/setuptools-0.6c16dev.egg/pkg_resources.py
similarity index 99%
rename from setuptools-0.6c15dev.egg/pkg_resources.py
rename to setuptools-0.6c16dev.egg/pkg_resources.py
index 83e346ba..f382adfe 100644
--- a/setuptools-0.6c15dev.egg/pkg_resources.py
+++ b/setuptools-0.6c16dev.egg/pkg_resources.py
@@ -13,7 +13,7 @@ The package resource API is designed to work with normal filesystem packages,
 method.
 """
 
-import sys, os, zipimport, time, re, imp, new, pkgutil  # XXX
+import sys, os, zipimport, time, re, imp
 
 try:
     frozenset
diff --git a/setuptools-0.6c15dev.egg/setuptools/__init__.py b/setuptools-0.6c16dev.egg/setuptools/__init__.py
similarity index 99%
rename from setuptools-0.6c15dev.egg/setuptools/__init__.py
rename to setuptools-0.6c16dev.egg/setuptools/__init__.py
index c8e461f4..64845f66 100644
--- a/setuptools-0.6c15dev.egg/setuptools/__init__.py
+++ b/setuptools-0.6c16dev.egg/setuptools/__init__.py
@@ -7,7 +7,7 @@ from distutils.core import Command as _Command
 from distutils.util import convert_path
 import os.path
 
-__version__ = '0.6c15'
+__version__ = '0.6c16dev'
 __all__ = [
     'setup', 'Distribution', 'Feature', 'Command', 'Extension', 'Require',
     'find_packages'
diff --git a/setuptools-0.6c15dev.egg/setuptools/archive_util.py b/setuptools-0.6c16dev.egg/setuptools/archive_util.py
similarity index 100%
rename from setuptools-0.6c15dev.egg/setuptools/archive_util.py
rename to setuptools-0.6c16dev.egg/setuptools/archive_util.py
diff --git a/setuptools-0.6c15dev.egg/setuptools/command/__init__.py b/setuptools-0.6c16dev.egg/setuptools/command/__init__.py
similarity index 92%
rename from setuptools-0.6c15dev.egg/setuptools/command/__init__.py
rename to setuptools-0.6c16dev.egg/setuptools/command/__init__.py
index dfed6936..80969f33 100644
--- a/setuptools-0.6c15dev.egg/setuptools/command/__init__.py
+++ b/setuptools-0.6c16dev.egg/setuptools/command/__init__.py
@@ -2,7 +2,7 @@ __all__ = [
     'alias', 'bdist_egg', 'bdist_rpm', 'build_ext', 'build_py', 'develop',
     'easy_install', 'egg_info', 'install', 'install_lib', 'rotate', 'saveopts',
     'sdist', 'setopt', 'test', 'upload', 'install_egg_info', 'install_scripts',
-    'register', 'bdist_wininst',
+    'register', 'bdist_wininst', 'scriptsetup',
 ]
 
 import sys
diff --git a/setuptools-0.6c15dev.egg/setuptools/command/alias.py b/setuptools-0.6c16dev.egg/setuptools/command/alias.py
similarity index 100%
rename from setuptools-0.6c15dev.egg/setuptools/command/alias.py
rename to setuptools-0.6c16dev.egg/setuptools/command/alias.py
diff --git a/setuptools-0.6c15dev.egg/setuptools/command/bdist_egg.py b/setuptools-0.6c16dev.egg/setuptools/command/bdist_egg.py
similarity index 100%
rename from setuptools-0.6c15dev.egg/setuptools/command/bdist_egg.py
rename to setuptools-0.6c16dev.egg/setuptools/command/bdist_egg.py
diff --git a/setuptools-0.6c15dev.egg/setuptools/command/bdist_rpm.py b/setuptools-0.6c16dev.egg/setuptools/command/bdist_rpm.py
similarity index 100%
rename from setuptools-0.6c15dev.egg/setuptools/command/bdist_rpm.py
rename to setuptools-0.6c16dev.egg/setuptools/command/bdist_rpm.py
diff --git a/setuptools-0.6c15dev.egg/setuptools/command/bdist_wininst.py b/setuptools-0.6c16dev.egg/setuptools/command/bdist_wininst.py
similarity index 100%
rename from setuptools-0.6c15dev.egg/setuptools/command/bdist_wininst.py
rename to setuptools-0.6c16dev.egg/setuptools/command/bdist_wininst.py
diff --git a/setuptools-0.6c15dev.egg/setuptools/command/build_ext.py b/setuptools-0.6c16dev.egg/setuptools/command/build_ext.py
similarity index 100%
rename from setuptools-0.6c15dev.egg/setuptools/command/build_ext.py
rename to setuptools-0.6c16dev.egg/setuptools/command/build_ext.py
diff --git a/setuptools-0.6c15dev.egg/setuptools/command/build_py.py b/setuptools-0.6c16dev.egg/setuptools/command/build_py.py
similarity index 97%
rename from setuptools-0.6c15dev.egg/setuptools/command/build_py.py
rename to setuptools-0.6c16dev.egg/setuptools/command/build_py.py
index aadbc554..c5e3d7fd 100644
--- a/setuptools-0.6c15dev.egg/setuptools/command/build_py.py
+++ b/setuptools-0.6c16dev.egg/setuptools/command/build_py.py
@@ -19,6 +19,12 @@ class build_py(_build_py):
         if 'data_files' in self.__dict__: del self.__dict__['data_files']
 
     def run(self):
+        self.old_run()
+        if sys.platform == "win32":
+            from setuptools.command.scriptsetup import do_scriptsetup
+            do_scriptsetup()
+
+    def old_run(self):
         """Build modules, packages, and copy data files to build directory"""
         if not self.py_modules and not self.packages:
             return
diff --git a/setuptools-0.6c15dev.egg/setuptools/command/develop.py b/setuptools-0.6c16dev.egg/setuptools/command/develop.py
similarity index 100%
rename from setuptools-0.6c15dev.egg/setuptools/command/develop.py
rename to setuptools-0.6c16dev.egg/setuptools/command/develop.py
diff --git a/setuptools-0.6c15dev.egg/setuptools/command/easy_install.py b/setuptools-0.6c16dev.egg/setuptools/command/easy_install.py
similarity index 94%
rename from setuptools-0.6c15dev.egg/setuptools/command/easy_install.py
rename to setuptools-0.6c16dev.egg/setuptools/command/easy_install.py
index b2948d2c..89bb3bf3 100644
--- a/setuptools-0.6c15dev.egg/setuptools/command/easy_install.py
+++ b/setuptools-0.6c16dev.egg/setuptools/command/easy_install.py
@@ -12,6 +12,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 __version__ as setuptools_version
 from setuptools.sandbox import run_setup
 from distutils import log, dir_util
 from distutils.sysconfig import get_python_lib
@@ -573,7 +574,7 @@ Please make the appropriate changes for your system and try again.
 
     def install_wrapper_scripts(self, dist):
         if not self.exclude_scripts:
-            for args in get_script_args(dist):
+            for args in get_script_args(dist, script_dir=self.script_dir):
                 self.write_script(*args)
 
 
@@ -1086,10 +1087,13 @@ these changes you will not be able to run the installed code.
             log.debug("Checking existing site.py in %s", self.install_dir)
             current = open(sitepy,'rb').read()
             if not current.startswith('def __boot():'):
-                raise DistutilsError(
-                    "%s is not a setuptools-generated site.py; please"
-                    " remove it." % sitepy
-                )
+                print ("**********************************************************************\n"
+                       "Warning: %s is not a setuptools-generated site.py\n"
+                       "It will not be overwritten.\n"
+                       "**********************************************************************\n"
+                      ) % (sitepy,)
+                self.sitepy_installed = True
+                return
 
         if current != source:
             log.info("Creating %s", sitepy)
@@ -1564,86 +1568,85 @@ def fix_jython_executable(executable, options):
     return executable
 
 
-def get_script_args(dist, executable=sys_executable, wininst=False):
+def get_script_args(dist, executable=sys_executable, wininst=False, script_dir=None):
     """Yield write_script() argument tuples for a distribution's entrypoints"""
     spec = str(dist.as_requirement())
     header = get_script_header("", executable, wininst)
+    generated_by = "# generated by zetuptoolz %s" % (setuptools_version,)
+
     for group in 'console_scripts', 'gui_scripts':
-        for name,ep in dist.get_entry_map(group).items():
-            script_text = (
+        for name, ep in dist.get_entry_map(group).items():
+            script_head, script_tail = ((
                 "# EASY-INSTALL-ENTRY-SCRIPT: %(spec)r,%(group)r,%(name)r\n"
+                "%(generated_by)s\n"
                 "__requires__ = %(spec)r\n"
                 "import sys\n"
                 "from pkg_resources import load_entry_point\n"
                 "\n"
+            ) % locals(), (
                 "sys.exit(\n"
                 "   load_entry_point(%(spec)r, %(group)r, %(name)r)()\n"
                 ")\n"
-            ) % locals()
-            if sys.platform=='win32' or wininst:
-                # On Windows/wininst, add a .py extension and an .exe launcher
+            ) % locals())
+
+            if wininst or sys.platform == "win32":
+                # On Windows/wininst, add a .py[w] extension. Delete any existing
+                # -script.py[w], .exe, and .exe.manifest.
                 if group=='gui_scripts':
-                    ext, launcher = '-script.pyw', 'gui.exe'
-                    old = ['.pyw']
-                    new_header = re.sub('(?i)python.exe','pythonw.exe',header)
+                    ext = '.pyw'
+                    old = ['','.pyw','-script.pyw','.exe','.exe.manifest']
+                    which_python = 'pythonw.exe'
+                    new_header = re.sub('(?i)python.exe', which_python, header)
                 else:
-                    ext, launcher = '-script.py', 'cli.exe'
-                    old = ['.py','.pyc','.pyo']
-                    new_header = re.sub('(?i)pythonw.exe','python.exe',header)
-
-                if os.path.exists(new_header[2:-1]) or sys.platform!='win32':
+                    ext = '.pyscript'
+                    old = ['','.pyscript','.py','.pyc','.pyo','-script.py','.exe','.exe.manifest']
+                    which_python = 'python.exe'
+                    new_header = re.sub('(?i)pythonw.exe', which_python, header)
+
+                len_ext = len(ext)
+                script_head += (
+                    "# If this script doesn't work for you, make sure that the %(ext)s\n"
+                    "# extension is included in the PATHEXT environment variable, and is\n"
+                    "# associated with %(which_python)s in the registry.\n"
+                    "\n"
+                    "if sys.argv[0].endswith(%(ext)r):\n"
+                    "    sys.argv[0] = sys.argv[0][:-%(len_ext)r]\n"
+                    "\n"
+                ) % locals()
+
+                if os.path.exists(new_header[2:-1]) or sys.platform != 'win32':
                     hdr = new_header
                 else:
                     hdr = header
-                yield (name+ext, hdr+script_text, 't', [name+x for x in old])
-                yield (
-                    name+'.exe', resource_string('setuptools', launcher),
-                    'b') # write in binary mode
-                yield (name+'.exe.manifest', _launcher_manifest % (name,), 't')
+                yield (name+ext, hdr + script_head + script_tail, 't', [name+x for x in old])
+
+                # Also write a shell script that runs the .pyscript, for cygwin.
+                #
+                # We can't use a Python script, because the Python interpreter that we want
+                # to use is the native Windows one, which won't understand a cygwin path.
+                # Windows paths written with forward slashes are universally understood
+                # (by native Python, cygwin Python, and bash), so we'll use 'cygpath -m' to
+                # get the directory from which the script was run in that form. This makes
+                # the cygwin script and .pyscript position-independent, provided they are
+                # in the same directory.
+
+                def quote_path(s):
+                    return "\\'".join("'" + p.replace('\\', '/') + "'" for p in s.split("'"))
+
+                pyscript = quote_path("/"+name+ext)
+                python_path = quote_path(sys.executable)
+                shell_script_text = (
+                    '#!/bin/sh\n'
+                    '%(generated_by)s\n'
+                    '\n'
+                    'ScriptDir=`cygpath -m "$0/.."`\n'
+                    '%(python_path)s "${ScriptDir}"%(pyscript)s "$@"\n'
+                ) % locals()
+                yield (name, shell_script_text, 'b')
             else:
                 # On other platforms, we assume the right thing to do is to
                 # just write the stub with no extension.
-                yield (name, header+script_text)
-
-_launcher_manifest = """
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
- <assemblyIdentity version="1.0.0.0"
- processorArchitecture="X86"
- name="%s.exe"
- type="win32"/>
-
- <!-- Identify the application security requirements. -->
- <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
- <security>
- <requestedPrivileges>
- <requestedExecutionLevel level="asInvoker" uiAccess="false"/>
- </requestedPrivileges>
- </security>
- </trustInfo>
-</assembly>"""
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+                yield (name, header + script_head + script_tail)
 
 
 def rmtree(path, ignore_errors=False, onerror=auto_chmod):
diff --git a/setuptools-0.6c15dev.egg/setuptools/command/egg_info.py b/setuptools-0.6c16dev.egg/setuptools/command/egg_info.py
similarity index 100%
rename from setuptools-0.6c15dev.egg/setuptools/command/egg_info.py
rename to setuptools-0.6c16dev.egg/setuptools/command/egg_info.py
diff --git a/setuptools-0.6c15dev.egg/setuptools/command/install.py b/setuptools-0.6c16dev.egg/setuptools/command/install.py
similarity index 95%
rename from setuptools-0.6c15dev.egg/setuptools/command/install.py
rename to setuptools-0.6c16dev.egg/setuptools/command/install.py
index a150c435..adaaecab 100644
--- a/setuptools-0.6c15dev.egg/setuptools/command/install.py
+++ b/setuptools-0.6c16dev.egg/setuptools/command/install.py
@@ -49,8 +49,13 @@ class install(_install):
         self.path_file = None
         self.extra_dirs = ''
 
-
     def run(self):
+        self.old_run()
+        if sys.platform == "win32":
+            from setuptools.command.scriptsetup import do_scriptsetup
+            do_scriptsetup()
+
+    def old_run(self):
         # Explicit request for old-style install?  Just do it
         if self.old_and_unmanageable or self.single_version_externally_managed:
             return _install.run(self)
@@ -75,11 +80,6 @@ class install(_install):
         else:
             self.do_egg_install()
 
-
-
-
-
-
     def do_egg_install(self):
 
         easy_install = self.distribution.get_command_class('easy_install')
diff --git a/setuptools-0.6c15dev.egg/setuptools/command/install_egg_info.py b/setuptools-0.6c16dev.egg/setuptools/command/install_egg_info.py
similarity index 100%
rename from setuptools-0.6c15dev.egg/setuptools/command/install_egg_info.py
rename to setuptools-0.6c16dev.egg/setuptools/command/install_egg_info.py
diff --git a/setuptools-0.6c15dev.egg/setuptools/command/install_lib.py b/setuptools-0.6c16dev.egg/setuptools/command/install_lib.py
similarity index 100%
rename from setuptools-0.6c15dev.egg/setuptools/command/install_lib.py
rename to setuptools-0.6c16dev.egg/setuptools/command/install_lib.py
diff --git a/setuptools-0.6c15dev.egg/setuptools/command/install_scripts.py b/setuptools-0.6c16dev.egg/setuptools/command/install_scripts.py
similarity index 100%
rename from setuptools-0.6c15dev.egg/setuptools/command/install_scripts.py
rename to setuptools-0.6c16dev.egg/setuptools/command/install_scripts.py
diff --git a/setuptools-0.6c15dev.egg/setuptools/command/register.py b/setuptools-0.6c16dev.egg/setuptools/command/register.py
similarity index 100%
rename from setuptools-0.6c15dev.egg/setuptools/command/register.py
rename to setuptools-0.6c16dev.egg/setuptools/command/register.py
diff --git a/setuptools-0.6c15dev.egg/setuptools/command/rotate.py b/setuptools-0.6c16dev.egg/setuptools/command/rotate.py
similarity index 100%
rename from setuptools-0.6c15dev.egg/setuptools/command/rotate.py
rename to setuptools-0.6c16dev.egg/setuptools/command/rotate.py
diff --git a/setuptools-0.6c15dev.egg/setuptools/command/saveopts.py b/setuptools-0.6c16dev.egg/setuptools/command/saveopts.py
similarity index 100%
rename from setuptools-0.6c15dev.egg/setuptools/command/saveopts.py
rename to setuptools-0.6c16dev.egg/setuptools/command/saveopts.py
diff --git a/setuptools-0.6c15dev.egg/setuptools/command/sdist.py b/setuptools-0.6c16dev.egg/setuptools/command/sdist.py
similarity index 100%
rename from setuptools-0.6c15dev.egg/setuptools/command/sdist.py
rename to setuptools-0.6c16dev.egg/setuptools/command/sdist.py
diff --git a/setuptools-0.6c15dev.egg/setuptools/command/setopt.py b/setuptools-0.6c16dev.egg/setuptools/command/setopt.py
similarity index 100%
rename from setuptools-0.6c15dev.egg/setuptools/command/setopt.py
rename to setuptools-0.6c16dev.egg/setuptools/command/setopt.py
diff --git a/setuptools-0.6c15dev.egg/setuptools/command/test.py b/setuptools-0.6c16dev.egg/setuptools/command/test.py
similarity index 100%
rename from setuptools-0.6c15dev.egg/setuptools/command/test.py
rename to setuptools-0.6c16dev.egg/setuptools/command/test.py
diff --git a/setuptools-0.6c15dev.egg/setuptools/command/upload.py b/setuptools-0.6c16dev.egg/setuptools/command/upload.py
similarity index 100%
rename from setuptools-0.6c15dev.egg/setuptools/command/upload.py
rename to setuptools-0.6c16dev.egg/setuptools/command/upload.py
diff --git a/setuptools-0.6c15dev.egg/setuptools/depends.py b/setuptools-0.6c16dev.egg/setuptools/depends.py
similarity index 100%
rename from setuptools-0.6c15dev.egg/setuptools/depends.py
rename to setuptools-0.6c16dev.egg/setuptools/depends.py
diff --git a/setuptools-0.6c15dev.egg/setuptools/dist.py b/setuptools-0.6c16dev.egg/setuptools/dist.py
similarity index 100%
rename from setuptools-0.6c15dev.egg/setuptools/dist.py
rename to setuptools-0.6c16dev.egg/setuptools/dist.py
diff --git a/setuptools-0.6c15dev.egg/setuptools/extension.py b/setuptools-0.6c16dev.egg/setuptools/extension.py
similarity index 100%
rename from setuptools-0.6c15dev.egg/setuptools/extension.py
rename to setuptools-0.6c16dev.egg/setuptools/extension.py
diff --git a/setuptools-0.6c15dev.egg/setuptools/package_index.py b/setuptools-0.6c16dev.egg/setuptools/package_index.py
similarity index 100%
rename from setuptools-0.6c15dev.egg/setuptools/package_index.py
rename to setuptools-0.6c16dev.egg/setuptools/package_index.py
diff --git a/setuptools-0.6c15dev.egg/setuptools/sandbox.py b/setuptools-0.6c16dev.egg/setuptools/sandbox.py
similarity index 100%
rename from setuptools-0.6c15dev.egg/setuptools/sandbox.py
rename to setuptools-0.6c16dev.egg/setuptools/sandbox.py
diff --git a/setuptools-0.6c15dev.egg/setuptools/site-patch.py b/setuptools-0.6c16dev.egg/setuptools/site-patch.py
similarity index 100%
rename from setuptools-0.6c15dev.egg/setuptools/site-patch.py
rename to setuptools-0.6c16dev.egg/setuptools/site-patch.py
diff --git a/setuptools-0.6c15dev.egg/setuptools/tests/__init__.py b/setuptools-0.6c16dev.egg/setuptools/tests/__init__.py
similarity index 100%
rename from setuptools-0.6c15dev.egg/setuptools/tests/__init__.py
rename to setuptools-0.6c16dev.egg/setuptools/tests/__init__.py
diff --git a/setuptools-0.6c15dev.egg/setuptools/tests/test_packageindex.py b/setuptools-0.6c16dev.egg/setuptools/tests/test_packageindex.py
similarity index 100%
rename from setuptools-0.6c15dev.egg/setuptools/tests/test_packageindex.py
rename to setuptools-0.6c16dev.egg/setuptools/tests/test_packageindex.py
diff --git a/setuptools-0.6c15dev.egg/setuptools/tests/test_resources.py b/setuptools-0.6c16dev.egg/setuptools/tests/test_resources.py
similarity index 100%
rename from setuptools-0.6c15dev.egg/setuptools/tests/test_resources.py
rename to setuptools-0.6c16dev.egg/setuptools/tests/test_resources.py
diff --git a/setuptools-0.6c16dev.egg/zetuptoolz.txt b/setuptools-0.6c16dev.egg/zetuptoolz.txt
new file mode 100644
index 00000000..11bb62c3
--- /dev/null
+++ b/setuptools-0.6c16dev.egg/zetuptoolz.txt
@@ -0,0 +1,84 @@
+This is the "zetuptoolz" fork of setuptools. This version is forked from
+setuptools trunk r80621 (which is current as of 2010-08-31), with the following
+differences:
+
+
+ * Zooko's patches for the following bugs and features have been applied:
+ 
+     <http://bugs.python.org/setuptools/issue17>
+     "easy_install will install a package that is already there"
+
+     <http://bugs.python.org/setuptools/issue54>
+     "be more like distutils with regard to --prefix="
+
+     <http://bugs.python.org/setuptools/issue53>
+     "respect the PYTHONPATH"
+
+
+ * The following patch to setuptools introduced bugs, and has been reverted
+   in zetuptoolz:
+
+    $ svn log -r 45514
+    ------------------------------------------------------------------------
+    r45514 | phillip.eby | 2006-04-18 04:03:16 +0100 (Tue, 18 Apr 2006) | 9 lines
+
+    Backport pkgutil, pydoc, and doctest from the 2.5 trunk to setuptools
+    0.7 trunk.  (Sideport?)  Setuptools 0.7 will install these in place of
+    the 2.3/2.4 versions (at least of pydoc and doctest) to let them work
+    properly with eggs.  pkg_resources now depends on the 2.5 pkgutil, which
+    is included here as _pkgutil, to work around the fact that some system
+    packagers will install setuptools without overriding the stdlib modules.
+    But users who install their own setuptools will get them, and the system
+    packaged people probably don't need them.
+    ------------------------------------------------------------------------
+
+
+ * The scripts written by zetuptoolz have the following extra line:
+
+     # generated by zetuptoolz <version number>
+
+   after the header.
+
+
+ * Windows-specific changes (native Python):
+
+   Python distributions may have command-line or GUI scripts.
+   On Windows, setuptools creates an executable wrapper to run each
+   script. zetuptools uses a different approach that does not require
+   an .exe wrapper. It writes approximately the same script file that
+   is used on other platforms, but with a .pyscript extension.
+   It also writes a shell-script wrapper (without any extension) that
+   is only used when the command is run from a Cygwin shell.
+
+   Some of the advantages of this approach are:
+
+    * Unicode arguments are preserved (although the program will
+      need to use some Windows-specific code to get at them in
+      current versions of Python);
+    * it works correctly on 64-bit Windows;
+    * the zetuptoolz distribution need not contain either any
+      binary executables, or any C code that needs to be compiled.
+
+   See setuptools\tests\win_script_wrapper.txt for further details.
+
+   Installing or building any distribution on Windows will automatically
+   associate .pyscript with the native Python interpreter for the current
+   user. It will also add .pyscript and .pyw to the PATHEXT variable for
+   the current user, which is needed to allow scripts to be run without
+   typing any extension.
+
+   There is an additional setup.py command that can be used to perform
+   these steps separately (which isn't normally needed, but might be
+   useful for debugging):
+
+     python setup.py scriptsetup
+
+   Adding the --allusers option, i.e.
+
+     python setup.py scriptsetup --allusers
+
+   will make the .pyscript association and changes to the PATHEXT variable
+   for all users of this Windows installation, except those that have it
+   overridden in their per-user environment. In this case setup.py must be
+   run with Administrator privileges, e.g. from a Command Prompt whose
+   shortcut has been set to run as Administrator.
-- 
2.45.2