1 files changed, 3 insertions, 4 deletions
diff --git a/setuptools/tests/server.py b/setuptools/tests/server.py
index b2ab7acc..c7343340 100644
--- a/setuptools/tests/server.py
+++ b/setuptools/tests/server.py
@@ -1,12 +1,11 @@
 """Basic http server for tests to simulate PyPI or custom indexes
 """
-import urllib2
 import sys
 import time
 import threading
 import BaseHTTPServer
-from BaseHTTPServer import HTTPServer
-from SimpleHTTPServer import SimpleHTTPRequestHandler
+from setuptools.compat import (urllib2, URLError, HTTPServer,
+                               SimpleHTTPRequestHandler)
 
 class IndexServer(HTTPServer):
     """Basic single-threaded http server simulating a package index
@@ -48,7 +47,7 @@ class IndexServer(HTTPServer):
                 urllib2.urlopen(url, timeout=5)
             else:
                 urllib2.urlopen(url)
-        except urllib2.URLError:
+        except URLError:
             # ignore any errors; all that's important is the request
             pass
         self.thread.join()