diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2020-09-04 10:22:54 -0400 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2020-09-04 10:22:54 -0400 |
| commit | fc4d9828768ceebd2f9337481450c88376c013e9 (patch) | |
| tree | 6dff622c50739ca19fdfbecf1008a42589d37b57 /setuptools/tests/test_integration.py | |
| parent | 7bb73a477de24069002516eb6eb1d755bed9d65b (diff) | |
| parent | 03d36b9edb53e266a0b4b836e1e3178f989a0781 (diff) | |
| download | python-setuptools-git-feature/implicit-bootstrap.tar.gz | |
Merge branch 'master' into feature/implicit-bootstrapfeature/implicit-bootstrap
Diffstat (limited to 'setuptools/tests/test_integration.py')
| -rw-r--r-- | setuptools/tests/test_integration.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/setuptools/tests/test_integration.py b/setuptools/tests/test_integration.py index f1a27f8b..24cef480 100644 --- a/setuptools/tests/test_integration.py +++ b/setuptools/tests/test_integration.py @@ -11,8 +11,8 @@ import subprocess import functools import tarfile import zipfile +import urllib.request -from setuptools.extern.six.moves import urllib import pytest from setuptools.command.easy_install import easy_install |