summaryrefslogtreecommitdiff
path: root/setuptools/dist.py
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 /setuptools/dist.py
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 'setuptools/dist.py')
-rw-r--r--setuptools/dist.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/setuptools/dist.py b/setuptools/dist.py
index 70731225..4964a9e8 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -14,13 +14,12 @@ from distutils.errors import (DistutilsOptionError, DistutilsPlatformError,
DistutilsSetupError)
from setuptools.extern import six
+from pkg_resources.extern import packaging
from setuptools.depends import Require
from setuptools import windows_support
import pkg_resources
-packaging = pkg_resources.packaging
-
def _get_unpatched(cls):
"""Protect against re-patching the distutils if reloaded