diff -r 72065b3b90a4 -r 80880ad3fccd mercurial/pycompat.py
--- a/mercurial/pycompat.py	Mon Jun 27 15:53:38 2016 +0530
+++ b/mercurial/pycompat.py	Mon Jun 27 16:16:10 2016 +0530
@@ -18,6 +18,13 @@
     pickle.dumps # silence pyflakes
 
 try:
+    import urlparse
+    urlparse.urlparse
+except ImportError:
+    import urllib.parse as urlparse
+    urlparse.urlparse
+
+try:
     import cStringIO as io
     stringio = io.StringIO
 except ImportError: