--- a/mercurial/hgweb/server.py	Thu Apr 07 00:05:48 2016 +0000
+++ b/mercurial/hgweb/server.py	Wed Apr 06 23:22:12 2016 +0000
@@ -15,7 +15,6 @@
 import socket
 import sys
 import traceback
-import urllib
 
 from ..i18n import _
 
@@ -24,6 +23,9 @@
     util,
 )
 
+urlerr = util.urlerr
+urlreq = util.urlreq
+
 from . import (
     common,
 )
@@ -38,7 +40,7 @@
         path, query = uri.split('?', 1)
     else:
         path, query = uri, ''
-    return urllib.unquote(path), query
+    return urlreq.unquote(path), query
 
 class _error_logger(object):
     def __init__(self, handler):