From: david-sarah <david-sarah@jacaranda.org>
Date: Tue, 3 Aug 2010 00:38:15 +0000 (-0700)
Subject: update bundled zetuptools with doc changes, change to script setup for Windows XP... 
X-Git-Tag: allmydata-tahoe-1.8.0b2~43
X-Git-Url: https://git.rkrishnan.org/specifications/%5B/%5D%20/flags/status?a=commitdiff_plain;h=e16c794f192f0cd7d7f4b63bcf042c085de7b8b2;p=tahoe-lafs%2Ftahoe-lafs.git

update bundled zetuptools with doc changes, change to script setup for Windows XP, and to have the 'develop' command run script setup.
---

diff --git a/setuptools-0.6c16dev.egg/setuptools/command/develop.py b/setuptools-0.6c16dev.egg/setuptools/command/develop.py
index 429ad8e9..303f488e 100644
--- a/setuptools-0.6c16dev.egg/setuptools/command/develop.py
+++ b/setuptools-0.6c16dev.egg/setuptools/command/develop.py
@@ -20,6 +20,12 @@ class develop(easy_install):
     command_consumes_arguments = False  # override base
 
     def run(self):
+        self.old_run()
+        if sys.platform == "win32":
+            from setuptools.command.scriptsetup import do_scriptsetup
+            do_scriptsetup()
+
+    def old_run(self):
         if self.uninstall:
             self.multi_version = True
             self.uninstall_link()
@@ -34,11 +40,6 @@ class develop(easy_install):
         self.setup_path = None
         self.always_copy_from = '.'   # always copy eggs installed in curdir
 
-
-
-
-
-
     def finalize_options(self):
         ei = self.get_finalized_command("egg_info")
         if ei.broken_egg_info:
diff --git a/setuptools-0.6c16dev.egg/setuptools/command/easy_install.py b/setuptools-0.6c16dev.egg/setuptools/command/easy_install.py
index 89bb3bf3..da296d94 100644
--- a/setuptools-0.6c16dev.egg/setuptools/command/easy_install.py
+++ b/setuptools-0.6c16dev.egg/setuptools/command/easy_install.py
@@ -1087,10 +1087,11 @@ 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():'):
-                print ("**********************************************************************\n"
-                       "Warning: %s is not a setuptools-generated site.py\n"
-                       "It will not be overwritten.\n"
-                       "**********************************************************************\n"
+                print ("\n"
+                       "***********************************************************************\n"
+                       "Warning: %s is not a\n"
+                       "setuptools-generated site.py. It will not be overwritten.\n"
+                       "***********************************************************************\n"
                       ) % (sitepy,)
                 self.sitepy_installed = True
                 return
diff --git a/setuptools-0.6c16dev.egg/setuptools/command/scriptsetup.py b/setuptools-0.6c16dev.egg/setuptools/command/scriptsetup.py
index df60f9c4..db68c07a 100644
--- a/setuptools-0.6c16dev.egg/setuptools/command/scriptsetup.py
+++ b/setuptools-0.6c16dev.egg/setuptools/command/scriptsetup.py
@@ -256,7 +256,29 @@ def do_scriptsetup(allusers=False):
         broadcast_settingchange(allusers)
 
     if changed_env:
-        print "\n" \
-              "Changes have been made to the persistent environment, but not\n" \
-              "in this Command Prompt. Running installed Python scripts will\n" \
-              "only work from new Command Prompts opened from now on.\n"
+        # whether logout is needed seems to randomly differ between installations
+        # of XP, but it is not needed in Vista or later.
+        try:
+            import platform, re
+            need_logout = not re.search(r'^[6-9]|([1-9][0-9]+)\.', platform.version())
+        except Exception, e:
+            e  # hush pyflakes
+            need_logout = True
+
+        if need_logout:
+            print """
+***********************************************************************
+Changes have been made to the persistent environment, but they may not
+take effect in this Windows session. Running installed Python scripts
+from a Command Prompt may only work after you have logged out and back
+in again, or rebooted.
+***********************************************************************
+"""
+        else:
+            print """
+***********************************************************************
+Changes have been made to the persistent environment, but not in this
+Command Prompt. Running installed Python scripts will only work from
+new Command Prompts opened from now on.
+***********************************************************************
+"""
diff --git a/setuptools-0.6c16dev.egg/zetuptoolz.txt b/setuptools-0.6c16dev.egg/zetuptoolz.txt
index 11bb62c3..25c029d0 100644
--- a/setuptools-0.6c16dev.egg/zetuptoolz.txt
+++ b/setuptools-0.6c16dev.egg/zetuptoolz.txt
@@ -13,6 +13,8 @@ differences:
 
      <http://bugs.python.org/setuptools/issue53>
      "respect the PYTHONPATH"
+     (Note: this patch does not work as intended when site.py has been modified.
+     This will be fixed in a future version.)
 
 
  * The following patch to setuptools introduced bugs, and has been reverted
@@ -33,6 +35,13 @@ differences:
     ------------------------------------------------------------------------
 
 
+ * If unpatched setuptools decides that it needs to change an existing site.py
+   file that appears not to have been written by it (because the file does not
+   start with "def __boot():"), it aborts the installation.
+   zetuptoolz leaves the file alone and outputs a warning, but continues with
+   the installation.
+
+
  * The scripts written by zetuptoolz have the following extra line:
 
      # generated by zetuptoolz <version number>