D3344: url: some bytes/str cleanup where we interface with stdlib funcs
durin42 (Augie Fackler)
phabricator at mercurial-scm.org
Mon Apr 16 19:21:35 EDT 2018
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG126998dcfb08: url: some bytes/str cleanup where we interface with stdlib funcs (authored by durin42, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D3344?vs=8221&id=8338
REVISION DETAIL
https://phab.mercurial-scm.org/D3344
AFFECTED FILES
mercurial/url.py
CHANGE DETAILS
diff --git a/mercurial/url.py b/mercurial/url.py
--- a/mercurial/url.py
+++ b/mercurial/url.py
@@ -486,7 +486,8 @@
cookiefile = util.expandpath(cookiefile)
try:
- cookiejar = util.cookielib.MozillaCookieJar(cookiefile)
+ cookiejar = util.cookielib.MozillaCookieJar(
+ pycompat.fsdecode(cookiefile))
cookiejar.load()
self.cookiejar = cookiejar
except util.cookielib.LoadError as e:
@@ -591,6 +592,6 @@
url_, authinfo = u.authinfo()
else:
path = util.normpath(os.path.abspath(url_))
- url_ = 'file://' + urlreq.pathname2url(path)
+ url_ = 'file://' + pycompat.bytesurl(urlreq.pathname2url(path))
authinfo = None
return opener(ui, authinfo).open(pycompat.strurl(url_), data)
To: durin42, #hg-reviewers, indygreg
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list