diff options
author | Jason R. Coombs <jaraco@jaraco.com> | 2014-09-27 16:13:48 -0400 |
---|---|---|
committer | Jason R. Coombs <jaraco@jaraco.com> | 2014-09-27 16:13:48 -0400 |
commit | 7d9c21a893431798ba77edd62b5490ff4ce47ecf (patch) | |
tree | 7dd192c676041fafe6f31425d5fe2d018895e704 /setuptools/tests/test_resources.py | |
parent | a9541756f6a12c91704feffec4ddfee859f12c30 (diff) | |
download | external_python_setuptools-7d9c21a893431798ba77edd62b5490ff4ce47ecf.tar.gz external_python_setuptools-7d9c21a893431798ba77edd62b5490ff4ce47ecf.tar.bz2 external_python_setuptools-7d9c21a893431798ba77edd62b5490ff4ce47ecf.zip |
Prefer packaging library if available.
Diffstat (limited to 'setuptools/tests/test_resources.py')
-rw-r--r-- | setuptools/tests/test_resources.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/setuptools/tests/test_resources.py b/setuptools/tests/test_resources.py index 9051b414..8336a85d 100644 --- a/setuptools/tests/test_resources.py +++ b/setuptools/tests/test_resources.py @@ -8,6 +8,13 @@ import tempfile import shutil from unittest import TestCase +try: + import packaging.version +except ImportError: + # fallback to vendored version + import setuptools._vendor.packaging.version + packaging = setuptools._vendor.packaging + import pkg_resources from pkg_resources import (parse_requirements, VersionConflict, parse_version, Distribution, EntryPoint, Requirement, safe_version, safe_name, @@ -16,7 +23,6 @@ from pkg_resources import (parse_requirements, VersionConflict, parse_version, from setuptools.command.easy_install import (get_script_header, is_sh, nt_quote_arg) from setuptools.compat import StringIO, iteritems, PY3 -from setuptools._vendor.packaging.version import Specifier from .py26compat import skipIf def safe_repr(obj, short=False): @@ -339,7 +345,7 @@ class RequirementsTests(TestCase): self.assertEqual(r2.extras, ("bar","foo")) # extras are normalized self.assertEqual(hash(r1), hash(r2)) self.assertEqual( - hash(r1), hash(("twisted", Specifier(">=1.2"), + hash(r1), hash(("twisted", packaging.version.Specifier(">=1.2"), frozenset(["foo","bar"]))) ) |