Prefer vendored packaging.

03a6fe16 · Jason R. Coombs · 2f970dc0 · 03a6fe16 · 03a6fe16
Commit 03a6fe16 authored Dec 29, 2014 by Jason R. Coombs
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 4 deletions

CHANGES.txt CHANGES.txt +7 -0

pkg_resources/__init__.py pkg_resources/__init__.py +5 -4

No files found.
--- 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
 -----

--- 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):