diff options
| author | PJ Eby <distutils-sig@python.org> | 2006-09-20 20:48:18 +0000 |
|---|---|---|
| committer | PJ Eby <distutils-sig@python.org> | 2006-09-20 20:48:18 +0000 |
| commit | 3bf8c4fa854d9cbb9af700b3852b1fded03fea54 (patch) | |
| tree | fd0144208164ea3b3e570e076d9be6ff3bf687ea /setuptools/tests/__init__.py | |
| parent | 7e0489e508d6f3edeb525c05f1c84f19b94361a6 (diff) | |
| download | python-setuptools-git-3bf8c4fa854d9cbb9af700b3852b1fded03fea54.tar.gz | |
Backport all known 2.5-compatibility fixes
--HG--
branch : setuptools-0.6
extra : convert_revision : svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/sandbox/branches/setuptools-0.6%4051935
Diffstat (limited to 'setuptools/tests/__init__.py')
| -rw-r--r-- | setuptools/tests/__init__.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/setuptools/tests/__init__.py b/setuptools/tests/__init__.py index 14942c61..c269be02 100644 --- a/setuptools/tests/__init__.py +++ b/setuptools/tests/__init__.py @@ -255,7 +255,7 @@ class FeatureTests(TestCase): self.req = Require('Distutils','1.0.3','distutils') self.dist = makeSetup( features={ - 'foo': Feature("foo",standard=True,requires=['baz',self.req]), + 'foo': Feature("foo",standard=True,require_features=['baz',self.req]), 'bar': Feature("bar", standard=True, packages=['pkg.bar'], py_modules=['bar_et'], remove=['bar.ext'], ), @@ -281,7 +281,7 @@ class FeatureTests(TestCase): self.failUnless( Feature("test",standard=True,remove='x').include_by_default() ) - # Feature must have either kwargs, removes, or requires + # Feature must have either kwargs, removes, or require_features self.assertRaises(DistutilsSetupError, Feature, "test") def testAvailability(self): @@ -320,7 +320,7 @@ class FeatureTests(TestCase): self.failUnless('scripts/baz_it' in dist.scripts) self.failUnless(('libfoo','foo/foofoo.c') in dist.libraries) self.assertEqual(dist.ext_modules,[]) - self.assertEqual(dist.requires, [self.req]) + self.assertEqual(dist.require_features, [self.req]) # If we ask for bar, it should fail because we explicitly disabled # it on the command line |