Mercurial > public > mercurial-scm > hg-stable
diff mercurial/extensions.py @ 37087: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 | 521f6c7e1756 |
| children | fb0de0bcd297 |
line wrap: on
line diff
--- a/mercurial/extensions.py Thu Mar 22 21:19:31 2018 +0900 +++ b/mercurial/extensions.py Thu Mar 22 21:56:20 2018 +0900 @@ -25,6 +25,10 @@ util, ) +from .utils import ( + stringutil, +) + _extensions = {} _disabledextensions = {} _aftercallbacks = {} @@ -118,7 +122,7 @@ # note: this ui.debug happens before --debug is processed, # Use --config ui.debug=1 to see them. ui.debug('could not import %s (%s): trying %s\n' - % (failed, util.forcebytestr(err), next)) + % (failed, stringutil.forcebytestr(err), next)) if ui.debugflag: ui.traceback() @@ -129,7 +133,7 @@ elif isinstance(xs, dict): for k, v in xs.items(): _rejectunicode(name, k) - _rejectunicode(b'%s.%s' % (name, util.forcebytestr(k)), v) + _rejectunicode(b'%s.%s' % (name, stringutil.forcebytestr(k)), v) elif isinstance(xs, type(u'')): raise error.ProgrammingError(b"unicode %r found in %s" % (xs, name), hint="use b'' to make it byte string") @@ -198,7 +202,7 @@ uisetup(ui) except Exception as inst: ui.traceback(force=True) - msg = util.forcebytestr(inst) + msg = stringutil.forcebytestr(inst) ui.warn(_("*** failed to set up extension %s: %s\n") % (name, msg)) return False return True @@ -215,7 +219,7 @@ extsetup() # old extsetup with no ui argument except Exception as inst: ui.traceback(force=True) - msg = util.forcebytestr(inst) + msg = stringutil.forcebytestr(inst) ui.warn(_("*** failed to set up extension %s: %s\n") % (name, msg)) return False return True @@ -233,7 +237,7 @@ try: load(ui, name, path) except Exception as inst: - msg = util.forcebytestr(inst) + msg = stringutil.forcebytestr(inst) if path: ui.warn(_("*** failed to import extension %s from %s: %s\n") % (name, path, msg))