From 170657b68f4b92e7e1bf82f5e19a831f5744af67 Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Wed, 24 Dec 2014 17:11:49 -0500 Subject: Setuptools now uses the 'packaging' package from pkg_resources, unifying the behavior around resolution of that package. --- pkg_resources/__init__.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'pkg_resources') diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py index 699ac114..a055cf1a 100644 --- a/pkg_resources/__init__.py +++ b/pkg_resources/__init__.py @@ -75,9 +75,14 @@ try: except ImportError: pass -import pkg_resources._vendor.packaging.version -import pkg_resources._vendor.packaging.specifiers -packaging = pkg_resources._vendor.packaging +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 class PEP440Warning(RuntimeWarning): -- cgit v1.2.3