Mercurial > hg
comparison mercurial/url.py @ 37084:f0b6fbea00cf
stringutil: bulk-replace call sites to point to new module
This might conflict with other patches floating around, sorry.
| author | Yuya Nishihara <yuya@tcha.org> |
|---|---|
| date | Thu, 22 Mar 2018 21:56:20 +0900 |
| parents | a708e1e4d7a8 |
| children | 9e6d3465f17e |
comparison
equal
deleted
inserted
replaced
| 37083:f99d64e8a4e4 | 37084:f0b6fbea00cf |
|---|---|
| 21 keepalive, | 21 keepalive, |
| 22 pycompat, | 22 pycompat, |
| 23 sslutil, | 23 sslutil, |
| 24 urllibcompat, | 24 urllibcompat, |
| 25 util, | 25 util, |
| 26 ) | |
| 27 from .utils import ( | |
| 28 stringutil, | |
| 26 ) | 29 ) |
| 27 | 30 |
| 28 httplib = util.httplib | 31 httplib = util.httplib |
| 29 stringio = util.stringio | 32 stringio = util.stringio |
| 30 urlerr = util.urlerr | 33 urlerr = util.urlerr |
| 475 cookiejar = util.cookielib.MozillaCookieJar(cookiefile) | 478 cookiejar = util.cookielib.MozillaCookieJar(cookiefile) |
| 476 cookiejar.load() | 479 cookiejar.load() |
| 477 self.cookiejar = cookiejar | 480 self.cookiejar = cookiejar |
| 478 except util.cookielib.LoadError as e: | 481 except util.cookielib.LoadError as e: |
| 479 ui.warn(_('(error loading cookie file %s: %s; continuing without ' | 482 ui.warn(_('(error loading cookie file %s: %s; continuing without ' |
| 480 'cookies)\n') % (cookiefile, util.forcebytestr(e))) | 483 'cookies)\n') % (cookiefile, stringutil.forcebytestr(e))) |
| 481 | 484 |
| 482 def http_request(self, request): | 485 def http_request(self, request): |
| 483 if self.cookiejar: | 486 if self.cookiejar: |
| 484 self.cookiejar.add_cookie_header(request) | 487 self.cookiejar.add_cookie_header(request) |
| 485 | 488 |