diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2015-01-02 18:38:36 -0500 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2015-01-02 18:38:36 -0500 |
| commit | 5448fd4a00e2e2dfa8195060edc7f6b573c5d842 (patch) | |
| tree | b1707d36f745cf24eaca9cf15e48952c7729f205 /tests | |
| parent | c73f2792c1f25e014e3d0950ad80fa2a6d1edf33 (diff) | |
| parent | 9188a1518bb954dcba535cc0fe9aff2e5fb0e69a (diff) | |
| download | python-setuptools-bitbucket-5448fd4a00e2e2dfa8195060edc7f6b573c5d842.tar.gz | |
Merge with 10.2.1
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/manual_test.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/manual_test.py b/tests/manual_test.py index e6489b1c..af4ec09b 100644 --- a/tests/manual_test.py +++ b/tests/manual_test.py @@ -7,7 +7,8 @@ import tempfile import subprocess from distutils.command.install import INSTALL_SCHEMES from string import Template -from setuptools.compat import urlopen + +from six.moves import urllib def _system_call(*args): assert subprocess.call(args) == 0 @@ -76,7 +77,7 @@ def test_full(): f.write(SIMPLE_BUILDOUT) with open('bootstrap.py', 'w') as f: - f.write(urlopen(BOOTSTRAP).read()) + f.write(urllib.request.urlopen(BOOTSTRAP).read()) _system_call('bin/python', 'bootstrap.py') _system_call('bin/buildout', '-q') |