summaryrefslogtreecommitdiff
path: root/setuptools/tests/test_dist.py
diff options
context:
space:
mode:
authorOleg Sharov <o.sharov@gmail.com>2018-11-13 12:52:43 +0400
committerOleg Sharov <o.sharov@gmail.com>2018-11-13 12:52:43 +0400
commitba7698287094f7274ae7cbabaf6baedc175ac213 (patch)
treebd1655ce361461f25cbc7db68a88eb08de83434d /setuptools/tests/test_dist.py
parentad80b390b1a01be5db1c97c4b86dce1e90d25f21 (diff)
downloadpython-setuptools-git-ba7698287094f7274ae7cbabaf6baedc175ac213.tar.gz
import internal version of six
Diffstat (limited to 'setuptools/tests/test_dist.py')
-rw-r--r--setuptools/tests/test_dist.py3
1 files changed, 1 insertions, 2 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):
"""