[Python-checkins] commit of r41909 - in sandbox/trunk/setuptools: pkg_resources.py setuptools/tests/test_resources.py

[phillip.eby]

Author: phillip.eby
Date: Wed Jan  4 00:10:20 2006
New Revision: 41909

Modified:
   sandbox/trunk/setuptools/pkg_resources.py
   sandbox/trunk/setuptools/setuptools/tests/test_resources.py
Log:
Make it clearer that Requirement.parse() is the only way for users 
to create correct Requirement instances.


Modified: sandbox/trunk/setuptools/pkg_resources.py
==============================================================================
--- sandbox/trunk/setuptools/pkg_resources.py	(original)
+++ sandbox/trunk/setuptools/pkg_resources.py	Wed Jan  4 00:10:20 2006
@@ -2049,9 +2049,9 @@
 
 
 class Requirement:
-    def __init__(self, project_name, specs=(), extras=()):
-        self.project_name = project_name
-        self.key = project_name.lower()
+    def __init__(self, project_name, specs, extras):
+        """DO NOT CALL THIS UNDOCUMENTED METHOD; use Requirement.parse()!"""
+        self.project_name, self.key = project_name, project_name.lower()
         index = [(parse_version(v),state_machine[op],op,v) for op,v in specs]
         index.sort()
         self.specs = [(op,ver) for parsed,trans,op,ver in index]

Modified: sandbox/trunk/setuptools/setuptools/tests/test_resources.py
==============================================================================
--- sandbox/trunk/setuptools/setuptools/tests/test_resources.py	(original)
+++ sandbox/trunk/setuptools/setuptools/tests/test_resources.py	Wed Jan  4 00:10:20 2006
@@ -291,22 +291,22 @@
         r = Requirement.parse("Twisted>=1.2")
         self.assertEqual(str(r),"Twisted>=1.2")
         self.assertEqual(repr(r),"Requirement.parse('Twisted>=1.2')")
-        self.assertEqual(r, Requirement("Twisted", [('>=','1.2')]))
-        self.assertEqual(r, Requirement("twisTed", [('>=','1.2')]))
-        self.assertNotEqual(r, Requirement("Twisted", [('>=','2.0')]))
-        self.assertNotEqual(r, Requirement("Zope", [('>=','1.2')]))
-        self.assertNotEqual(r, Requirement("Zope", [('>=','3.0')]))
+        self.assertEqual(r, Requirement("Twisted", [('>=','1.2')], ()))
+        self.assertEqual(r, Requirement("twisTed", [('>=','1.2')], ()))
+        self.assertNotEqual(r, Requirement("Twisted", [('>=','2.0')], ()))
+        self.assertNotEqual(r, Requirement("Zope", [('>=','1.2')], ()))
+        self.assertNotEqual(r, Requirement("Zope", [('>=','3.0')], ()))
         self.assertNotEqual(r, Requirement.parse("Twisted[extras]>=1.2"))
 
     def testOrdering(self):
-        r1 = Requirement("Twisted", [('==','1.2c1'),('>=','1.2')])
-        r2 = Requirement("Twisted", [('>=','1.2'),('==','1.2c1')])
+        r1 = Requirement("Twisted", [('==','1.2c1'),('>=','1.2')], ())
+        r2 = Requirement("Twisted", [('>=','1.2'),('==','1.2c1')], ())
         self.assertEqual(r1,r2)
         self.assertEqual(str(r1),str(r2))
         self.assertEqual(str(r2),"Twisted==1.2c1,>=1.2")
 
     def testBasicContains(self):
-        r = Requirement("Twisted", [('>=','1.2')])
+        r = Requirement("Twisted", [('>=','1.2')], ())
         foo_dist = Distribution.from_filename("FooPkg-1.3_1.egg")
         twist11  = Distribution.from_filename("Twisted-1.1.egg")
         twist12  = Distribution.from_filename("Twisted-1.2.egg")
@@ -418,15 +418,15 @@
     def testSimpleRequirements(self):
         self.assertEqual(
             list(parse_requirements('Twis-Ted>=1.2-1')),
-            [Requirement('Twis-Ted',[('>=','1.2-1')])]
+            [Requirement('Twis-Ted',[('>=','1.2-1')], ())]
         )
         self.assertEqual(
             list(parse_requirements('Twisted >=1.2, \ # more\n<2.0')),
-            [Requirement('Twisted',[('>=','1.2'),('<','2.0')])]
+            [Requirement('Twisted',[('>=','1.2'),('<','2.0')], ())]
         )
         self.assertEqual(
             Requirement.parse("FooBar==1.99a3"),
-            Requirement("FooBar", [('==','1.99a3')])
+            Requirement("FooBar", [('==','1.99a3')], ())
         )
         self.assertRaises(ValueError,Requirement.parse,">=2.3")
         self.assertRaises(ValueError,Requirement.parse,"x\\")