From 4ae526d52609fe2a7515d87e4c0d047a826411a7 Mon Sep 17 00:00:00 2001 From: Donald Stufft Date: Wed, 19 Nov 2014 13:38:16 -0500 Subject: Always use the vendored copy of packaging --- pkg_resources.py | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'pkg_resources.py') 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 -- cgit v1.2.3