[cig-commits] r5007 - cs/ez_setup

[leif at geodynamics.org]

Author: leif
Date: 2006-10-14 08:15:38 -0700 (Sat, 14 Oct 2006)
New Revision: 5007

Modified:
   cs/ez_setup/__init__.py
Log:
Applied my "download latest but don't require latest"
patch.


Modified: cs/ez_setup/__init__.py
===================================================================
--- cs/ez_setup/__init__.py	2006-10-14 15:09:45 UTC (rev 5006)
+++ cs/ez_setup/__init__.py	2006-10-14 15:15:38 UTC (rev 5007)
@@ -54,6 +54,18 @@
     version=DEFAULT_VERSION, download_base=DEFAULT_URL, to_dir=os.curdir,
     download_delay=15
 ):
+    try:
+        # If setuptools 0.6b1 or later is installed, run with it.
+        from pkg_resources import require
+        require("setuptools>=0.6b1")
+    except:
+        _use_setuptools(version, download_base, to_dir, download_delay)
+
+
+def _use_setuptools(
+    version=DEFAULT_VERSION, download_base=DEFAULT_URL, to_dir=os.curdir,
+    download_delay=15
+):
     """Automatically find/download setuptools and make it available on sys.path
 
     `version` should be a valid setuptools version number that is available