--- a/mercurial/pycompat.py	Tue Mar 21 22:28:16 2017 -0700
+++ b/mercurial/pycompat.py	Tue Mar 21 22:34:17 2017 -0700
@@ -287,6 +287,7 @@
     import SimpleHTTPServer
     import urllib2
     import urllib
+    import urlparse
     urlreq._registeraliases(urllib, (
         "addclosehook",
         "addinfourl",
@@ -317,6 +318,10 @@
         "Request",
         "urlopen",
     ))
+    urlreq._registeraliases(urlparse, (
+        "urlparse",
+        "urlunparse",
+    ))
     urlerr._registeraliases(urllib2, (
         "HTTPError",
         "URLError",
@@ -339,6 +344,8 @@
         "splitpasswd",
         "splitport",
         "splituser",
+        "urlparse",
+        "urlunparse",
     ))
     urlreq._registeralias(urllib.parse, "unquote_to_bytes", "unquote")
     import urllib.request