Mercurial > hg
comparison mercurial/url.py @ 37735:126998dcfb08
url: some bytes/str cleanup where we interface with stdlib funcs
Differential Revision: https://phab.mercurial-scm.org/D3344
| author | Augie Fackler <augie@google.com> |
|---|---|
| date | Fri, 13 Apr 2018 21:04:25 -0400 |
| parents | 9e6d3465f17e |
| children | f80db6adabbe |
comparison
equal
deleted
inserted
replaced
| 37734:a1110db1e455 | 37735:126998dcfb08 |
|---|---|
| 484 if not cookiefile: | 484 if not cookiefile: |
| 485 return | 485 return |
| 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: |
| 493 ui.warn(_('(error loading cookie file %s: %s; continuing without ' | 494 ui.warn(_('(error loading cookie file %s: %s; continuing without ' |
| 494 'cookies)\n') % (cookiefile, stringutil.forcebytestr(e))) | 495 'cookies)\n') % (cookiefile, stringutil.forcebytestr(e))) |
| 589 if u.scheme: | 590 if u.scheme: |
| 590 u.scheme = u.scheme.lower() | 591 u.scheme = u.scheme.lower() |
| 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) |