aboutsummaryrefslogtreecommitdiffstats
path: root/setuptools/tests/test_dist_info.py
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2012-07-22 15:45:53 -0400
committerJason R. Coombs <jaraco@jaraco.com>2012-07-22 15:45:53 -0400
commite10bb776722f4dd1d5bcda17adcc557ea0eb8b14 (patch)
treefffb19c19a37a547e8db488a0eff0a4f05472577 /setuptools/tests/test_dist_info.py
parent7bc21a080559758ed92d03c238d5b51bbf2c8835 (diff)
downloadexternal_python_setuptools-e10bb776722f4dd1d5bcda17adcc557ea0eb8b14.tar.gz
external_python_setuptools-e10bb776722f4dd1d5bcda17adcc557ea0eb8b14.tar.bz2
external_python_setuptools-e10bb776722f4dd1d5bcda17adcc557ea0eb8b14.zip
Use compatible skipIf
--HG-- branch : distribute extra : rebase_source : 4964057db0c3186c1c8b9e934cf23f1b4ddcb167
Diffstat (limited to 'setuptools/tests/test_dist_info.py')
-rw-r--r--setuptools/tests/test_dist_info.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/setuptools/tests/test_dist_info.py b/setuptools/tests/test_dist_info.py
index cf8fb0f9..68ba9e24 100644
--- a/setuptools/tests/test_dist_info.py
+++ b/setuptools/tests/test_dist_info.py
@@ -34,8 +34,8 @@ class TestDistInfo(unittest.TestCase):
assert versioned.version == '2.718' # from filename
assert unversioned.version == '0.3' # from METADATA
- @unittest.skipIf('markerlib' not in globals(),
- "install markerlib to test conditional dependencies")
+ @skipIf('markerlib' not in globals(),
+ "install markerlib to test conditional dependencies")
def test_conditional_dependencies(self):
requires = [pkg_resources.Requirement.parse('splort==4'),
pkg_resources.Requirement.parse('quux>=1.1')]