##// END OF EJS Templates
py3: use bytes() to byte-stringify url object in url.py...
Yuya Nishihara -
r36326:54831656 default
parent child Browse files
Show More
@@ -71,10 +71,10 b' class passwordmgr(object):'
71 u.query = None
71 u.query = None
72 if not self.ui.interactive():
72 if not self.ui.interactive():
73 raise error.Abort(_('http authorization required for %s') %
73 raise error.Abort(_('http authorization required for %s') %
74 util.hidepassword(str(u)))
74 util.hidepassword(bytes(u)))
75
75
76 self.ui.write(_("http authorization required for %s\n") %
76 self.ui.write(_("http authorization required for %s\n") %
77 util.hidepassword(str(u)))
77 util.hidepassword(bytes(u)))
78 self.ui.write(_("realm: %s\n") % realm)
78 self.ui.write(_("realm: %s\n") % realm)
79 if user:
79 if user:
80 self.ui.write(_("user: %s\n") % user)
80 self.ui.write(_("user: %s\n") % user)
@@ -124,7 +124,7 b' class proxyhandler(urlreq.proxyhandler):'
124 else:
124 else:
125 self.no_list = no_list
125 self.no_list = no_list
126
126
127 proxyurl = str(proxy)
127 proxyurl = bytes(proxy)
128 proxies = {'http': proxyurl, 'https': proxyurl}
128 proxies = {'http': proxyurl, 'https': proxyurl}
129 ui.debug('proxying through %s\n' % util.hidepassword(proxyurl))
129 ui.debug('proxying through %s\n' % util.hidepassword(proxyurl))
130 else:
130 else:
General Comments 0
You need to be logged in to leave comments. Login now