Distribute no longer shadows setuptools if we require a 0.7-series

  setuptools.
Added _override_setuptools() checker method and calling it in two places that checks whether we request a setuptools from the 0.7 series. Including test.

1 files changed, 22 insertions, 2 deletions

diff --git a/setuptools/tests/test_resources.py b/setuptools/tests/test_resources.py
index d53aef56..c9236e88 100644
--- a/setuptools/tests/test_resources.py
+++ b/setuptools/tests/test_resources.py
@@ -354,8 +354,28 @@ class RequirementsTests(TestCase):
         self.failUnless(d("foo-0.3a3.egg") in r2)
         self.failUnless(d("foo-0.3a5.egg") in r2)
 
-
-
+    def testDistributeSetuptoolsOverride(self):
+        # Plain setuptools or distribute mean we return distribute.
+        self.assertEqual(
+            Requirement.parse('setuptools').project_name, 'distribute')
+        self.assertEqual(
+            Requirement.parse('distribute').project_name, 'distribute')
+        # setuptools lower than 0.7 means distribute
+        self.assertEqual(
+            Requirement.parse('setuptools==0.6c9').project_name, 'distribute')
+        self.assertEqual(
+            Requirement.parse('setuptools==0.6c10').project_name, 'distribute')
+        self.assertEqual(
+            Requirement.parse('setuptools>=0.6').project_name, 'distribute')
+        self.assertEqual(
+            Requirement.parse('setuptools < 0.7').project_name, 'distribute')
+        # setuptools 0.7 and higher means setuptools.
+        self.assertEqual(
+            Requirement.parse('setuptools == 0.7').project_name, 'setuptools')
+        self.assertEqual(
+            Requirement.parse('setuptools == 0.7a1').project_name, 'setuptools')
+        self.assertEqual(
+            Requirement.parse('setuptools >= 0.7').project_name, 'setuptools')