diff options
| -rw-r--r-- | CHANGES.txt | 7 | ||||
| -rw-r--r-- | pkg_resources/__init__.py | 9 |
2 files changed, 12 insertions, 4 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index 39fbee7c..73ddaff7 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -2,6 +2,13 @@ CHANGES ======= +--- +9.1 +--- + +* Prefer vendored packaging library `as recommended + <https://github.com/jaraco/setuptools/commit/170657b68f4b92e7e1bf82f5e19a831f5744af67#commitcomment-9109448>`_. + ----- 9.0.1 ----- diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py index a055cf1a..0664f666 100644 --- a/pkg_resources/__init__.py +++ b/pkg_resources/__init__.py @@ -76,13 +76,14 @@ except ImportError: pass try: - import packaging.version - import packaging.specifiers -except ImportError: - # fallback to vendored version import pkg_resources._vendor.packaging.version import pkg_resources._vendor.packaging.specifiers packaging = pkg_resources._vendor.packaging +except ImportError: + # fallback to naturally-installed version; allows system packagers to + # omit vendored packages. + import packaging.version + import packaging.specifiers class PEP440Warning(RuntimeWarning): |