--- a/tests/tinyproxy.py	Tue Mar 21 22:39:52 2017 -0700
+++ b/tests/tinyproxy.py	Tue Mar 21 22:45:02 2017 -0700
@@ -23,8 +23,8 @@
 from mercurial import util
 
 httpserver = util.httpserver
-urlparse = util.urlparse
 socketserver = util.socketserver
+urlreq = util.urlreq
 
 if os.environ.get('HGIPV6', '0') == '1':
     family = socket.AF_INET6
@@ -85,7 +85,7 @@
             self.connection.close()
 
     def do_GET(self):
-        (scm, netloc, path, params, query, fragment) = urlparse.urlparse(
+        (scm, netloc, path, params, query, fragment) = urlreq.urlparse(
             self.path, 'http')
         if scm != 'http' or fragment or not netloc:
             self.send_error(400, "bad url %s" % self.path)
@@ -96,7 +96,7 @@
                 self.log_request()
                 soc.send("%s %s %s\r\n" % (
                     self.command,
-                    urlparse.urlunparse(('', '', path, params, query, '')),
+                    urlreq.urlunparse(('', '', path, params, query, '')),
                     self.request_version))
                 self.headers['Connection'] = 'close'
                 del self.headers['Proxy-Connection']