Merge branch 'master' into feature/2093-docs-revampfeature/2093-docs-revamp

1 files changed, 5 insertions, 6 deletions

diff --git a/setuptools/tests/test_packageindex.py b/setuptools/tests/test_packageindex.py
index 29aace13..8e9435ef 100644
--- a/setuptools/tests/test_packageindex.py
+++ b/setuptools/tests/test_packageindex.py
@@ -1,12 +1,11 @@
-from __future__ import absolute_import
-
 import sys
 import os
 import distutils.errors
 import platform
+import urllib.request
+import urllib.error
+import http.client
 
-from setuptools.extern import six
-from setuptools.extern.six.moves import urllib, http_client
 import mock
 import pytest
 
@@ -60,7 +59,7 @@ class TestPackageIndex:
         )
 
         def _urlopen(*args):
-            raise http_client.BadStatusLine('line')
+            raise http.client.BadStatusLine('line')
 
         index.opener = _urlopen
         url = 'http://example.com'
@@ -84,7 +83,7 @@ class TestPackageIndex:
         try:
             index.open_url(url)
         except distutils.errors.DistutilsError as error:
-            msg = six.text_type(error)
+            msg = str(error)
             assert (
                 'nonnumeric port' in msg
                 or 'getaddrinfo failed' in msg