--- a/mercurial/pycompat.py	Mon Oct 17 17:42:46 2016 +0200
+++ b/mercurial/pycompat.py	Sun Oct 09 09:02:25 2016 -0400
@@ -22,6 +22,7 @@
     import Queue as _queue
     import SocketServer as socketserver
     import urlparse
+    urlunquote = urlparse.unquote
     import xmlrpclib
 else:
     import http.client as httplib
@@ -30,6 +31,7 @@
     import queue as _queue
     import socketserver
     import urllib.parse as urlparse
+    urlunquote = urlparse.unquote_to_bytes
     import xmlrpc.client as xmlrpclib
 
 if ispy3: