From 03a6fe16d7de9ff44ca38f2c5beb807e4733e5a0 Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Mon, 29 Dec 2014 13:13:14 -0500 Subject: Prefer vendored packaging. --- pkg_resources/__init__.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'pkg_resources/__init__.py') 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): -- cgit v1.2.3