summaryrefslogtreecommitdiff
path: root/tests/test_pypi.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 /tests/test_pypi.py
parent4c560effc96a75f337193bc164ad4117b0e333ab (diff)
downloadpython-setuptools-git-3d0cc355fb5e8012cb8c72f0e25042a5a44f31d6.tar.gz
Revert "Merge pull request #933 from pypa/feature/581-depend-not-bundle"
This reverts commit 089cdeb489a0fa94d11b7307b54210ef9aa40511, reversing changes made to aaec654d804cb78dbb6391afff721a63f26a71cd.
Diffstat (limited to 'tests/test_pypi.py')
-rw-r--r--tests/test_pypi.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/test_pypi.py b/tests/test_pypi.py
index 173b2c87..b3425e53 100644
--- a/tests/test_pypi.py
+++ b/tests/test_pypi.py
@@ -2,8 +2,8 @@ import os
import subprocess
import virtualenv
-from six.moves import http_client
-from six.moves import xmlrpc_client
+from setuptools.extern.six.moves import http_client
+from setuptools.extern.six.moves import xmlrpc_client
TOP = 200
PYPI_HOSTNAME = 'pypi.python.org'