diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2017-02-24 11:49:51 -0500 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2017-02-24 11:49:51 -0500 |
| commit | 3d0cc355fb5e8012cb8c72f0e25042a5a44f31d6 (patch) | |
| tree | 2286b3cd70544e0089f658e17ddb3fed4126b356 /setuptools/dist.py | |
| parent | 4c560effc96a75f337193bc164ad4117b0e333ab (diff) | |
| download | external_python_setuptools-3d0cc355fb5e8012cb8c72f0e25042a5a44f31d6.tar.gz external_python_setuptools-3d0cc355fb5e8012cb8c72f0e25042a5a44f31d6.tar.bz2 external_python_setuptools-3d0cc355fb5e8012cb8c72f0e25042a5a44f31d6.zip | |
Revert "Merge pull request #933 from pypa/feature/581-depend-not-bundle"
This reverts commit 089cdeb489a0fa94d11b7307b54210ef9aa40511, reversing
changes made to aaec654d804cb78dbb6391afff721a63f26a71cd.
Diffstat (limited to 'setuptools/dist.py')
| -rw-r--r-- | setuptools/dist.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/setuptools/dist.py b/setuptools/dist.py index be55dc4e..159464be 100644 --- a/setuptools/dist.py +++ b/setuptools/dist.py @@ -12,9 +12,9 @@ from distutils.errors import (DistutilsOptionError, DistutilsPlatformError, DistutilsSetupError) from distutils.util import rfc822_escape -import six -from six.moves import map -import packaging +from setuptools.extern import six +from setuptools.extern.six.moves import map +from pkg_resources.extern import packaging from setuptools.depends import Require from setuptools import windows_support |