##// END OF EJS Templates
url: some bytes/str cleanup where we interface with stdlib funcs...
Augie Fackler -
r37753:126998dc default
parent child Browse files
Show More
@@ -486,7 +486,8 b' class cookiehandler(urlreq.basehandler):'
486
486
487 cookiefile = util.expandpath(cookiefile)
487 cookiefile = util.expandpath(cookiefile)
488 try:
488 try:
489 cookiejar = util.cookielib.MozillaCookieJar(cookiefile)
489 cookiejar = util.cookielib.MozillaCookieJar(
490 pycompat.fsdecode(cookiefile))
490 cookiejar.load()
491 cookiejar.load()
491 self.cookiejar = cookiejar
492 self.cookiejar = cookiejar
492 except util.cookielib.LoadError as e:
493 except util.cookielib.LoadError as e:
@@ -591,6 +592,6 b' def open(ui, url_, data=None):'
591 url_, authinfo = u.authinfo()
592 url_, authinfo = u.authinfo()
592 else:
593 else:
593 path = util.normpath(os.path.abspath(url_))
594 path = util.normpath(os.path.abspath(url_))
594 url_ = 'file://' + urlreq.pathname2url(path)
595 url_ = 'file://' + pycompat.bytesurl(urlreq.pathname2url(path))
595 authinfo = None
596 authinfo = None
596 return opener(ui, authinfo).open(pycompat.strurl(url_), data)
597 return opener(ui, authinfo).open(pycompat.strurl(url_), data)
General Comments 0
You need to be logged in to leave comments. Login now