diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2019-01-27 10:02:52 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-27 10:02:52 -0500 |
| commit | 0551421f082eea3f633bc6be23c16a04483aca98 (patch) | |
| tree | 76c5b37e3a56a232b4b5b66ab7e933edbe64cd25 /tests/manual_test.py | |
| parent | 28872fc9e7d15a1acf3bc557795c76c5e64dbad3 (diff) | |
| parent | 78fd73026ad7284819936b651f7cfbe8a1ec98c8 (diff) | |
| download | python-setuptools-git-0551421f082eea3f633bc6be23c16a04483aca98.tar.gz | |
Merge branch 'master' into license-fix-357
Diffstat (limited to 'tests/manual_test.py')
| -rw-r--r-- | tests/manual_test.py | 2 |
1 files changed, 1 insertions, 1 deletions
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): |