Minor fix previously fixed in a merge

--HG--
branch : distribute

2 files changed, 4 insertions, 2 deletions

diff --git a/setuptools/compat.py b/setuptools/compat.py
index 6d4ea539..27d472b5 100644
--- a/setuptools/compat.py
+++ b/setuptools/compat.py
@@ -16,6 +16,7 @@ if sys.version_info[0] < 3:
     import httplib
     from BaseHTTPServer import HTTPServer
     from SimpleHTTPServer import SimpleHTTPRequestHandler
+    from BaseHTTPServer import BaseHTTPRequestHandler
     iteritems = lambda o: o.iteritems()
     long_type = long
     maxsize = sys.maxint
@@ -57,6 +58,7 @@ else:
     from html.entities import name2codepoint
     import http.client as httplib
     from http.server import HTTPServer, SimpleHTTPRequestHandler
+    from http.server import BaseHTTPRequestHandler
     iteritems = lambda o: o.items()
     long_type = int
     maxsize = sys.maxsize
diff --git a/setuptools/tests/server.py b/setuptools/tests/server.py
index c7343340..0e7407bb 100644
--- a/setuptools/tests/server.py
+++ b/setuptools/tests/server.py
@@ -3,7 +3,7 @@
 import sys
 import time
 import threading
-import BaseHTTPServer
+from setuptools.compat import BaseHTTPRequestHandler
 from setuptools.compat import (urllib2, URLError, HTTPServer,
                                SimpleHTTPRequestHandler)
 
@@ -56,7 +56,7 @@ class IndexServer(HTTPServer):
         port = self.server_port
         return 'http://127.0.0.1:%s/setuptools/tests/indexes/' % port
 
-class RequestRecorder(BaseHTTPServer.BaseHTTPRequestHandler):
+class RequestRecorder(BaseHTTPRequestHandler):
     def do_GET(self):
         requests = vars(self.server).setdefault('requests', [])
         requests.append(self)