diff options
| author | PJ Eby <distutils-sig@python.org> | 2005-07-17 04:42:42 +0000 |
|---|---|---|
| committer | PJ Eby <distutils-sig@python.org> | 2005-07-17 04:42:42 +0000 |
| commit | 30f1c5ad93e21ec007d371313e2a27e4d0efb661 (patch) | |
| tree | b809540a247a26776845a6f9a96c91a20f983af1 /setuptools/tests/test_resources.py | |
| parent | c8ebbe361890f4c0a34d7c3c64aefb34c6fed3e6 (diff) | |
| download | external_python_setuptools-30f1c5ad93e21ec007d371313e2a27e4d0efb661.tar.gz external_python_setuptools-30f1c5ad93e21ec007d371313e2a27e4d0efb661.tar.bz2 external_python_setuptools-30f1c5ad93e21ec007d371313e2a27e4d0efb661.zip | |
Renamings for consistent terminology; distributions and requirements now
both have 'project_name' attributes, instead of one having 'name' and the
other 'distname'. Requirements no longer have 'options', they have
'extras'. This is the beginning of the terminology/architecture
refactoring described at:
http://mail.python.org/pipermail/distutils-sig/2005-June/004652.html
--HG--
branch : setuptools
extra : convert_revision : svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/sandbox/trunk/setuptools%4041132
Diffstat (limited to 'setuptools/tests/test_resources.py')
| -rw-r--r-- | setuptools/tests/test_resources.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/setuptools/tests/test_resources.py b/setuptools/tests/test_resources.py index 91199f47..10786144 100644 --- a/setuptools/tests/test_resources.py +++ b/setuptools/tests/test_resources.py @@ -73,7 +73,7 @@ class DistroTests(TestCase): self.assertEqual(ad.best_match(req,path).version, '1.4') def checkFooPkg(self,d): - self.assertEqual(d.name, "FooPkg") + self.assertEqual(d.project_name, "FooPkg") self.assertEqual(d.key, "foopkg") self.assertEqual(d.version, "1.3-1") self.assertEqual(d.py_version, "2.4") @@ -83,7 +83,7 @@ class DistroTests(TestCase): def testDistroBasics(self): d = Distribution( "/some/path", - name="FooPkg",version="1.3-1",py_version="2.4",platform="win32" + project_name="FooPkg",version="1.3-1",py_version="2.4",platform="win32" ) self.checkFooPkg(d) self.failUnless(d.installed_on(["/some/path"])) @@ -99,7 +99,7 @@ class DistroTests(TestCase): def testDistroMetadata(self): d = Distribution( - "/some/path", name="FooPkg", py_version="2.4", platform="win32", + "/some/path", project_name="FooPkg", py_version="2.4", platform="win32", metadata = Metadata( ('PKG-INFO',"Metadata-Version: 1.0\nVersion: 1.3-1\n") ) @@ -250,8 +250,8 @@ class RequirementsTests(TestCase): r3 = Requirement.parse("Twisted[BAR,FOO]>=1.2.0") self.assertEqual(r1,r2) self.assertEqual(r1,r3) - self.assertEqual(r1.options, ("foo","bar")) - self.assertEqual(r2.options, ("bar","FOO")) + self.assertEqual(r1.extras, ("foo","bar")) + self.assertEqual(r2.extras, ("bar","FOO")) self.assertEqual(hash(r1), hash(r2)) self.assertEqual( hash(r1), hash(("twisted", ((">=",parse_version("1.2")),), |