--- a/mercurial/util.py	Sun Oct 01 12:14:21 2017 -0400
+++ b/mercurial/util.py	Wed Oct 04 11:58:00 2017 -0400
@@ -50,6 +50,7 @@
     i18n,
     policy,
     pycompat,
+    urllibcompat,
 )
 
 base85 = policy.importmod(r'base85')
@@ -62,7 +63,6 @@
 cookielib = pycompat.cookielib
 empty = pycompat.empty
 httplib = pycompat.httplib
-httpserver = pycompat.httpserver
 pickle = pycompat.pickle
 queue = pycompat.queue
 socketserver = pycompat.socketserver
@@ -70,10 +70,12 @@
 stdin = pycompat.stdin
 stdout = pycompat.stdout
 stringio = pycompat.stringio
-urlerr = pycompat.urlerr
-urlreq = pycompat.urlreq
 xmlrpclib = pycompat.xmlrpclib
 
+httpserver = urllibcompat.httpserver
+urlerr = urllibcompat.urlerr
+urlreq = urllibcompat.urlreq
+
 # workaround for win32mbcs
 _filenamebytestr = pycompat.bytestr