diff -r 800ec7c048b0 -r 032c4c2f802a mercurial/localrepo.py
--- a/mercurial/localrepo.py	Thu Apr 07 00:05:48 2016 +0000
+++ b/mercurial/localrepo.py	Wed Apr 06 23:22:12 2016 +0000
@@ -12,7 +12,6 @@
 import os
 import random
 import time
-import urllib
 import weakref
 
 from .i18n import _
@@ -59,6 +58,8 @@
 
 release = lockmod.release
 propertycache = util.propertycache
+urlerr = util.urlerr
+urlreq = util.urlreq
 filecache = scmutil.filecache
 
 class repofilecache(filecache):
@@ -366,7 +367,7 @@
         if self.ui.configbool('experimental', 'bundle2-advertise', True):
             caps = set(caps)
             capsblob = bundle2.encodecaps(bundle2.getrepocaps(self))
-            caps.add('bundle2=' + urllib.quote(capsblob))
+            caps.add('bundle2=' + urlreq.quote(capsblob))
         return caps
 
     def _applyopenerreqs(self):