fixed the parsed api when dealing with setuptools name

--HG--
branch : distribute
extra : rebase_source : 9490c98e075e2473c7a7310822103f375d5f3832

pkg_resources.py

@@ -2497,10 +2497,11 @@ class Requirement:
                 # and if distribute is installed, we want to give
                 # distribute instead
                 if founded_req.project_name == 'setuptools':
-                    try:
-                        return self.parse('distribute')
-                    except ValueError:
+                    distribute = list(parse_requirements('distribute'))
+                    if len(distribute) == 1:
+                        return distribute[0]
                     return founded_req
+                else:
                     return founded_req
 
             raise ValueError("Expected only one requirement", s)

setuptools/tests/test_resources.py

@@ -341,18 +341,18 @@ class RequirementsTests(TestCase):
         )
 
     def testVersionEquality(self):
-        r1 = Requirement.parse("setuptools==0.3a2")
-        r2 = Requirement.parse("setuptools!=0.3a4")
+        r1 = Requirement.parse("foo==0.3a2")
+        r2 = Requirement.parse("foo!=0.3a4")
         d = Distribution.from_filename
 
-        self.failIf(d("setuptools-0.3a4.egg") in r1)
-        self.failIf(d("setuptools-0.3a1.egg") in r1)
-        self.failIf(d("setuptools-0.3a4.egg") in r2)
+        self.failIf(d("foo-0.3a4.egg") in r1)
+        self.failIf(d("foo-0.3a1.egg") in r1)
+        self.failIf(d("foo-0.3a4.egg") in r2)
 
-        self.failUnless(d("setuptools-0.3a2.egg") in r1)
-        self.failUnless(d("setuptools-0.3a2.egg") in r2)
-        self.failUnless(d("setuptools-0.3a3.egg") in r2)
-        self.failUnless(d("setuptools-0.3a5.egg") in r2)
+        self.failUnless(d("foo-0.3a2.egg") in r1)
+        self.failUnless(d("foo-0.3a2.egg") in r2)
+        self.failUnless(d("foo-0.3a3.egg") in r2)
+        self.failUnless(d("foo-0.3a5.egg") in r2)