--- a/tests/tinyproxy.py	Mon Jun 27 15:53:38 2016 +0530
+++ b/tests/tinyproxy.py	Mon Jun 27 16:16:10 2016 +0530
@@ -20,7 +20,10 @@
 import select
 import socket
 import sys
-import urlparse
+
+from mercurial import util
+
+urlparse = util.urlparse
 
 class ProxyHandler (BaseHTTPServer.BaseHTTPRequestHandler):
     __base = BaseHTTPServer.BaseHTTPRequestHandler