diff options
| -rw-r--r-- | setuptools/command/upload.py | 6 | ||||
| -rw-r--r-- | setuptools/tests/test_dist.py | 3 | ||||
| -rw-r--r-- | setuptools/tests/test_upload.py | 2 | ||||
| -rw-r--r-- | tests/manual_test.py | 2 |
4 files changed, 6 insertions, 7 deletions
diff --git a/setuptools/command/upload.py b/setuptools/command/upload.py index 3b8cab5e..dd17f7a9 100644 --- a/setuptools/command/upload.py +++ b/setuptools/command/upload.py @@ -12,9 +12,9 @@ from distutils.spawn import spawn from distutils.errors import DistutilsError -from six.moves.urllib.request import urlopen, Request -from six.moves.urllib.error import HTTPError -from six.moves.urllib.parse import urlparse +from setuptools.extern.six.moves.urllib.request import urlopen, Request +from setuptools.extern.six.moves.urllib.error import HTTPError +from setuptools.extern.six.moves.urllib.parse import urlparse class upload(orig.upload): """ diff --git a/setuptools/tests/test_dist.py b/setuptools/tests/test_dist.py index 170d27ed..cf830b43 100644 --- a/setuptools/tests/test_dist.py +++ b/setuptools/tests/test_dist.py @@ -7,13 +7,12 @@ from setuptools.dist import DistDeprecationWarning, _get_unpatched from setuptools import Distribution from setuptools.extern.six.moves.urllib.request import pathname2url from setuptools.extern.six.moves.urllib_parse import urljoin +from setuptools.extern import six from .textwrap import DALS from .test_easy_install import make_nspkg_sdist import pytest -import six - def test_dist_fetch_build_egg(tmpdir): """ diff --git a/setuptools/tests/test_upload.py b/setuptools/tests/test_upload.py index 9229bba1..cc0e8a0d 100644 --- a/setuptools/tests/test_upload.py +++ b/setuptools/tests/test_upload.py @@ -7,10 +7,10 @@ from distutils.errors import DistutilsError from distutils.version import StrictVersion import pytest -import six from setuptools.command.upload import upload from setuptools.dist import Distribution +from setuptools.extern import six def _parse_upload_body(body): diff --git a/tests/manual_test.py b/tests/manual_test.py index 52295f9a..99db4b01 100644 --- a/tests/manual_test.py +++ b/tests/manual_test.py @@ -8,7 +8,7 @@ import subprocess from distutils.command.install import INSTALL_SCHEMES from string import Template -from six.moves import urllib +from setuptools.extern.six.moves import urllib def _system_call(*args): |