aboutsummaryrefslogtreecommitdiffstats
path: root/setuptools/dist.py
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2018-03-17 14:10:32 -0400
committerJason R. Coombs <jaraco@jaraco.com>2018-03-17 14:10:32 -0400
commit929acc4e551448a68411968fb50336ad51ed4d3c (patch)
tree6eb60f4a8825bd6180746a984c423b15a5d57281 /setuptools/dist.py
parentd0f7a33daba39f60aa402c094cd4276b8b6ce462 (diff)
downloadexternal_python_setuptools-929acc4e551448a68411968fb50336ad51ed4d3c.tar.gz
external_python_setuptools-929acc4e551448a68411968fb50336ad51ed4d3c.tar.bz2
external_python_setuptools-929acc4e551448a68411968fb50336ad51ed4d3c.zip
Setuptools now vendors its own direct dependencies (packaging, six, pyparsing). Ref #1296.
Diffstat (limited to 'setuptools/dist.py')
-rw-r--r--setuptools/dist.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/setuptools/dist.py b/setuptools/dist.py
index b74dd0f5..cd34eef6 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -17,8 +17,8 @@ from distutils.util import rfc822_escape
from distutils.version import StrictVersion
from setuptools.extern import six
+from setuptools.extern import packaging
from setuptools.extern.six.moves import map, filter, filterfalse
-from pkg_resources.extern import packaging
from setuptools.depends import Require
from setuptools import windows_support
@@ -27,8 +27,8 @@ from setuptools.config import parse_configuration
import pkg_resources
from .py36compat import Distribution_parse_config_files
-__import__('pkg_resources.extern.packaging.specifiers')
-__import__('pkg_resources.extern.packaging.version')
+__import__('setuptools.extern.packaging.specifiers')
+__import__('setuptools.extern.packaging.version')
def _get_unpatched(cls):