aboutsummaryrefslogtreecommitdiffstats
path: root/setuptools/command/alias.py
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2017-02-24 11:49:51 -0500
committerJason R. Coombs <jaraco@jaraco.com>2017-02-24 11:49:51 -0500
commit3d0cc355fb5e8012cb8c72f0e25042a5a44f31d6 (patch)
tree2286b3cd70544e0089f658e17ddb3fed4126b356 /setuptools/command/alias.py
parent4c560effc96a75f337193bc164ad4117b0e333ab (diff)
downloadexternal_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/command/alias.py')
-rwxr-xr-xsetuptools/command/alias.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/setuptools/command/alias.py b/setuptools/command/alias.py
index 35ece78d..4532b1cc 100755
--- a/setuptools/command/alias.py
+++ b/setuptools/command/alias.py
@@ -1,6 +1,6 @@
from distutils.errors import DistutilsOptionError
-from six.moves import map
+from setuptools.extern.six.moves import map
from setuptools.command.setopt import edit_config, option_base, config_file