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 --- setuptools/tests/test_resources.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'setuptools/tests/test_resources.py') diff --git a/setuptools/tests/test_resources.py b/setuptools/tests/test_resources.py index 8336a85d..a8520e12 100644 --- a/setuptools/tests/test_resources.py +++ b/setuptools/tests/test_resources.py @@ -8,12 +8,9 @@ import tempfile import shutil from unittest import TestCase -try: - import packaging.version -except ImportError: - # fallback to vendored version - import setuptools._vendor.packaging.version - packaging = setuptools._vendor.packaging +import setuptools._vendor.packaging.version +import setuptools._vendor.packaging.specifiers +packaging = setuptools._vendor.packaging import pkg_resources from pkg_resources import (parse_requirements, VersionConflict, parse_version, -- cgit v1.2.1