summaryrefslogtreecommitdiff
path: root/setuptools/tests
diff options
context:
space:
mode:
Diffstat (limited to 'setuptools/tests')
-rw-r--r--setuptools/tests/test_dist.py3
-rw-r--r--setuptools/tests/test_upload.py2
2 files changed, 2 insertions, 3 deletions
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):