--- ez_setup/__init__.py.orig	2008-03-17 17:17:55.718936000 +0800

+++ ez_setup/__init__.py	2008-03-17 17:19:48.463046000 +0800

@@ -80,31 +80,31 @@

     this routine will print a message to ``sys.stderr`` and raise SystemExit in

     an attempt to abort the calling script.

     """

-    was_imported = 'pkg_resources' in sys.modules or 'setuptools' in sys.modules

-    def do_download():

+    try:

+        import setuptools

+        if setuptools.__version__ == '0.0.1':

+            print >>sys.stderr, (

+            "You have an obsolete version of setuptools installed.  Please\n"

+            "remove it from your system entirely before rerunning this script."

+            )

+            sys.exit(2)

+    except ImportError:

         egg = download_setuptools(version, download_base, to_dir, download_delay)

         sys.path.insert(0, egg)

         import setuptools; setuptools.bootstrap_install_from = egg

+

+    import pkg_resources

     try:

-        import pkg_resources

-    except ImportError:

-        return do_download()       

-    try:

-        pkg_resources.require("setuptools>="+version); return

+        pkg_resources.require("setuptools>="+version)

+

     except pkg_resources.VersionConflict, e:

-        if was_imported:

-            print >>sys.stderr, (

+        # XXX could we install in a subprocess here?

+        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)"

-            ) % (version, e.args[0])

-            sys.exit(2)

-        else:

-            del pkg_resources, sys.modules['pkg_resources']    # reload ok

-            return do_download()

-    except pkg_resources.DistributionNotFound:

-        return do_download()

+            " a more recent version first.\n\n(Currently using %r)"

+        ) % (version, e.args[0])

+        sys.exit(2)

 def download_setuptools(

     version=DEFAULT_VERSION, download_base=DEFAULT_URL, to_dir=os.curdir,

@@ -153,43 +153,9 @@

             if dst: dst.close()

     return os.path.realpath(saveto)

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

 def main(argv, version=DEFAULT_VERSION):

     """Install or upgrade setuptools and EasyInstall"""

+

     try:

         import setuptools

     except ImportError:

@@ -204,11 +170,8 @@

                 os.unlink(egg)

     else:

         if setuptools.__version__ == '0.0.1':

-            print >>sys.stderr, (

-            "You have an obsolete version of setuptools installed.  Please\n"

-            "remove it from your system entirely before rerunning this script."

-            )

-            sys.exit(2)

+            # tell the user to uninstall obsolete version

+            use_setuptools(version)

     req = "setuptools>="+version

     import pkg_resources

@@ -229,6 +192,8 @@

             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"""