diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2016-01-04 21:00:47 -0500 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2016-01-04 21:00:47 -0500 |
| commit | d9184f7b8f0b9405f68ea45dbd574aad6a08666d (patch) | |
| tree | e93b4d6ca527f8b22c4a11b978864f61ebe02405 /setuptools/tests/test_integration.py | |
| parent | 6bdbe8957d8c8d293e3fea3fa4baf45eb7c3a3a4 (diff) | |
| parent | b639cf0fa905f6fda3879c991197b759aaa20091 (diff) | |
| download | python-setuptools-git-19.3b1.tar.gz | |
Merge feature/issue-22919.3b1
Diffstat (limited to 'setuptools/tests/test_integration.py')
| -rw-r--r-- | setuptools/tests/test_integration.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/setuptools/tests/test_integration.py b/setuptools/tests/test_integration.py index 07f06db2..04772ba5 100644 --- a/setuptools/tests/test_integration.py +++ b/setuptools/tests/test_integration.py @@ -7,12 +7,12 @@ import glob import os import sys +from setuptools.extern.six.moves import urllib import pytest from setuptools.command.easy_install import easy_install from setuptools.command import easy_install as easy_install_pkg from setuptools.dist import Distribution -from setuptools.compat import urlopen def setup_module(module): @@ -26,7 +26,7 @@ def setup_module(module): pass try: - urlopen('https://pypi.python.org/pypi') + urllib.request.urlopen('https://pypi.python.org/pypi') except Exception as exc: pytest.skip(str(exc)) |