Moved to:

- distribute-0.6.15
- pip-0.9.0 # this is not released, it the version that has python3
  support

virtualenv_support/distribute_setup.py

@@ -1,3 +1,4 @@
+#!python
 """Bootstrap distribute installation
 
 If you want to use setuptools in your package's setup.py, just include this
@@ -45,8 +46,8 @@ def quote(arg):
             args = [quote(arg) for arg in args]
         return os.spawnl(os.P_WAIT, sys.executable, *args) == 0
 
-DEFAULT_VERSION = "0.6.15dev"
-DEFAULT_URL = "file:///home/vinay/tools/distribute/dist/"
+DEFAULT_VERSION = "0.6.15"
+DEFAULT_URL = "http://pypi.python.org/packages/source/d/distribute/"
 SETUPTOOLS_FAKED_VERSION = "0.6c11"
 
 SETUPTOOLS_PKG_INFO = """\

virtualenv_support/ez_setup.py

@@ -1,3 +1,4 @@
+#!python
 """Bootstrap setuptools installation
 
 If you want to use setuptools in your package's setup.py, just include this
@@ -69,8 +70,8 @@ def _validate_md5(egg_name, data):
     if egg_name in md5_data:
         digest = md5(data).hexdigest()
         if digest != md5_data[egg_name]:
-            sys.stderr.write(
-                "md5 validation of %s failed!  (Possible download problem?)\n"
+            print >>sys.stderr, (
+                "md5 validation of %s failed!  (Possible download problem?)"
                 % egg_name
             )
             sys.exit(2)
@@ -102,14 +103,14 @@ def do_download():
         return do_download()       
     try:
         pkg_resources.require("setuptools>="+version); return
-    except pkg_resources.VersionConflict:
-        e = sys.exc_info()[1]
+    except pkg_resources.VersionConflict, e:
         if was_imported:
-            sys.stderr.write(
+            print >>sys.stderr, (
             "The required version of setuptools (>=%s) is not available, and\n"
             "can't be installed while this script is running. Please install\n"
             " a more recent version first, using 'easy_install -U setuptools'."
-            "\n\n(Currently using %r)\n" % (version, e.args[0]))
+            "\n\n(Currently using %r)"
+            ) % (version, e.args[0])
             sys.exit(2)
     except pkg_resources.DistributionNotFound:
         pass
@@ -128,11 +129,7 @@ def download_setuptools(
     with a '/'). `to_dir` is the directory where the egg will be downloaded.
     `delay` is the number of seconds to pause before an actual download attempt.
     """
-    import shutil
-    try:
-        from urllib.request import urlopen
-    except ImportError:
-        from urllib2 import urlopen
+    import urllib2, shutil
     egg_name = "setuptools-%s-py%s.egg" % (version,sys.version[:3])
     url = download_base + egg_name
     saveto = os.path.join(to_dir, egg_name)
@@ -158,7 +155,7 @@ def download_setuptools(
                     version, download_base, delay, url
                 ); from time import sleep; sleep(delay)
             log.warn("Downloading %s", url)
-            src = urlopen(url)
+            src = urllib2.urlopen(url)
             # Read/write all in one block, so we don't create a corrupt file
             # if the download is interrupted.
             data = _validate_md5(egg_name, src.read())
@@ -219,10 +216,9 @@ def main(argv, version=DEFAULT_VERSION):
                 os.unlink(egg)
     else:
         if setuptools.__version__ == '0.0.1':
-            sys.stderr.write(
+            print >>sys.stderr, (
             "You have an obsolete version of setuptools installed.  Please\n"
-            "remove it from your system entirely before rerunning this "
-            "script.\n"
+            "remove it from your system entirely before rerunning this script."
             )
             sys.exit(2)
 
@@ -242,8 +238,8 @@ def main(argv, version=DEFAULT_VERSION):
             from setuptools.command.easy_install import main
             main(argv)
         else:
-            print("Setuptools version",version,"or greater has been installed.")
-            print('(Run "ez_setup.py -U setuptools" to reinstall or upgrade.)')
+            print "Setuptools version",version,"or greater has been installed."
+            print '(Run "ez_setup.py -U setuptools" to reinstall or upgrade.)'
 
 def update_md5(filenames):
     """Update our built-in md5 registry"""
@@ -266,7 +262,7 @@ def update_md5(filenames):
 
     match = re.search("\nmd5_data = {\n([^}]+)}", src)
     if not match:
-        sys.stderr.write("Internal error!\n")
+        print >>sys.stderr, "Internal error!"
         sys.exit(2)
 
     src = src[:match.start(1)] + repl + src[match.end(1):]