diff -r f99d64e8a4e4 -r f0b6fbea00cf mercurial/url.py --- a/mercurial/url.py Thu Mar 22 21:19:31 2018 +0900 +++ b/mercurial/url.py Thu Mar 22 21:56:20 2018 +0900 @@ -24,6 +24,9 @@ urllibcompat, util, ) +from .utils import ( + stringutil, +) httplib = util.httplib stringio = util.stringio @@ -477,7 +480,7 @@ self.cookiejar = cookiejar except util.cookielib.LoadError as e: ui.warn(_('(error loading cookie file %s: %s; continuing without ' - 'cookies)\n') % (cookiefile, util.forcebytestr(e))) + 'cookies)\n') % (cookiefile, stringutil.forcebytestr(e))) def http_request(self, request): if self.cookiejar: