diff options
author | phillip.eby <phillip.eby@6015fed2-1504-0410-9fe1-9d1591cc4771> | 2006-01-03 23:10:20 +0000 |
---|---|---|
committer | phillip.eby <phillip.eby@6015fed2-1504-0410-9fe1-9d1591cc4771> | 2006-01-03 23:10:20 +0000 |
commit | e46b1182a134d11d00c0e4897b3f01c586f9745e (patch) | |
tree | cbbfb2714143f7a1fbcecb28f09ac1ff946a1078 /setuptools/tests/test_resources.py | |
parent | d65859c10550e7215fda29f9226963da0236159d (diff) | |
download | python-setuptools-e46b1182a134d11d00c0e4897b3f01c586f9745e.tar.gz |
Make it clearer that Requirement.parse() is the only way for users
to create correct Requirement instances.
git-svn-id: http://svn.python.org/projects/sandbox/trunk/setuptools@41909 6015fed2-1504-0410-9fe1-9d1591cc4771
Diffstat (limited to 'setuptools/tests/test_resources.py')
-rw-r--r-- | setuptools/tests/test_resources.py | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/setuptools/tests/test_resources.py b/setuptools/tests/test_resources.py index 15b7acb..8ce1117 100644 --- a/setuptools/tests/test_resources.py +++ b/setuptools/tests/test_resources.py @@ -291,22 +291,22 @@ class RequirementsTests(TestCase): 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 @@ class ParseTests(TestCase): 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\\") |