Allow setuptools 0.7 to satisfy use_setuptools.0.6.44

2 files changed, 16 insertions, 0 deletions

diff --git a/CHANGES.txt b/CHANGES.txt
index 7d22ae1b..e18a534b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -3,6 +3,13 @@ CHANGES
 =======
 
 ------
+0.6.44
+------
+
+* ``distribute_setup.py`` has been updated to allow Setuptools 0.7 to
+  satisfy use_setuptools.
+
+------
 0.6.43
 ------
 
diff --git a/distribute_setup.py b/distribute_setup.py
index a2a06664..411c9c8c 100644
--- a/distribute_setup.py
+++ b/distribute_setup.py
@@ -144,6 +144,15 @@ def use_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL,
     try:
         try:
             import pkg_resources
+
+            # Setuptools 0.7b and later is a suitable (and preferable)
+            # substitute for any Distribute version.
+            try:
+                pkg_resources.require("setuptools>=0.7b")
+                return
+            except pkg_resources.DistributionNotFound:
+                pass
+
             if not hasattr(pkg_resources, '_distribute'):
                 if not no_fake:
                     _fake_setuptools()