diff options
| author | Donald Stufft <donald@stufft.io> | 2014-11-19 13:38:16 -0500 |
|---|---|---|
| committer | Donald Stufft <donald@stufft.io> | 2014-11-19 21:50:27 -0500 |
| commit | 4ae526d52609fe2a7515d87e4c0d047a826411a7 (patch) | |
| tree | 57d1420c54a16190e5ca63cfd99008e52a212edd | |
| parent | a15a276e1a7425ae884352958f87c9e506d2a1c8 (diff) | |
| download | python-setuptools-git-4ae526d52609fe2a7515d87e4c0d047a826411a7.tar.gz | |
Always use the vendored copy of packaging
| -rw-r--r-- | pkg_resources.py | 11 | ||||
| -rw-r--r-- | setuptools/tests/test_resources.py | 9 |
2 files changed, 6 insertions, 14 deletions
diff --git a/pkg_resources.py b/pkg_resources.py index 422b31b5..a3eef28f 100644 --- a/pkg_resources.py +++ b/pkg_resources.py @@ -75,14 +75,9 @@ try: except ImportError: pass -try: - import packaging.version - import packaging.specifiers -except ImportError: - # fallback to vendored version - import setuptools._vendor.packaging.version - import setuptools._vendor.packaging.specifiers - packaging = setuptools._vendor.packaging +import setuptools._vendor.packaging.version +import setuptools._vendor.packaging.specifiers +packaging = setuptools._vendor.packaging # For compatibility, expose packaging.version.parse as parse_version parse_version = packaging.version.parse diff --git a/setuptools/tests/test_resources.py b/setuptools/tests/test_resources.py index 8336a85d..a8520e12 100644 --- a/setuptools/tests/test_resources.py +++ b/setuptools/tests/test_resources.py @@ -8,12 +8,9 @@ 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 setuptools._vendor.packaging.version +import setuptools._vendor.packaging.specifiers +packaging = setuptools._vendor.packaging import pkg_resources from pkg_resources import (parse_requirements, VersionConflict, parse_version, |