diff options
author | Jason R. Coombs <jaraco@jaraco.com> | 2015-12-31 16:47:55 -0500 |
---|---|---|
committer | Jason R. Coombs <jaraco@jaraco.com> | 2015-12-31 16:47:55 -0500 |
commit | d8bf8413cd5b07690fd515498bc074592fae38a5 (patch) | |
tree | 20c2bfb84badebc4978e166a003c0b08c027ed74 /setuptools | |
parent | cac10881a6f2c2a9d3e76bcca3918b8065d9b3eb (diff) | |
download | python-setuptools-bitbucket-d8bf8413cd5b07690fd515498bc074592fae38a5.tar.gz |
Use the same technique in pkg_resources, relying on an 'extern' module to resolve the conditional import.
Diffstat (limited to 'setuptools')
-rwxr-xr-x | setuptools/command/egg_info.py | 2 | ||||
-rw-r--r-- | setuptools/dist.py | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py index cf46d24a..18a3105f 100755 --- a/setuptools/command/egg_info.py +++ b/setuptools/command/egg_info.py @@ -26,7 +26,7 @@ from pkg_resources import ( safe_version, yield_lines, EntryPoint, iter_entry_points, to_filename) import setuptools.unicode_utils as unicode_utils -from pkg_resources import packaging +from pkg_resources.extern import packaging try: from setuptools_svn import svn_utils 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 |