summaryrefslogtreecommitdiff
path: root/setuptools
diff options
context:
space:
mode:
Diffstat (limited to 'setuptools')
-rwxr-xr-xsetuptools/command/egg_info.py2
-rw-r--r--setuptools/dist.py3
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