summaryrefslogtreecommitdiff
path: root/pkg_resources/tests
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2015-12-31 16:47:55 -0500
committerJason R. Coombs <jaraco@jaraco.com>2015-12-31 16:47:55 -0500
commit9b985a9112d9be396adca6a1948076378c70cc34 (patch)
tree99e334a9df66bdeeb5a470c4abe65d9c66e0090d /pkg_resources/tests
parentddb91c20793d8e5e8a01e0302afeaaba76776741 (diff)
downloadpython-setuptools-git-9b985a9112d9be396adca6a1948076378c70cc34.tar.gz
Use the same technique in pkg_resources, relying on an 'extern' module to resolve the conditional import.
--HG-- branch : feature/issue-229
Diffstat (limited to 'pkg_resources/tests')
-rw-r--r--pkg_resources/tests/test_resources.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/pkg_resources/tests/test_resources.py b/pkg_resources/tests/test_resources.py
index 9fda892f..141d63ad 100644
--- a/pkg_resources/tests/test_resources.py
+++ b/pkg_resources/tests/test_resources.py
@@ -5,14 +5,13 @@ import shutil
import string
import pytest
+from pkg_resources.extern import packaging
import pkg_resources
from pkg_resources import (parse_requirements, VersionConflict, parse_version,
Distribution, EntryPoint, Requirement, safe_version, safe_name,
WorkingSet)
-packaging = pkg_resources.packaging
-
def safe_repr(obj, short=False):
""" copied from Python2.7"""