# HG changeset patch # User Pulkit Goyal <7895pulkit@gmail.com> # Date 1519928692 -19800 # Node ID 6e90c59b6da13bc9db5c89127bbe7d12686eee10 # Parent 149c5af35de5f3c46e97e7d41f345de7cfbf37cc py3: use pycompat.bytestr() to convert error instances to bytes Differential Revision: https://phab.mercurial-scm.org/D2516 diff -r 149c5af35de5 -r 6e90c59b6da1 mercurial/commands.py --- a/mercurial/commands.py Thu Mar 01 23:52:30 2018 +0530 +++ b/mercurial/commands.py Thu Mar 01 23:54:52 2018 +0530 @@ -2370,7 +2370,7 @@ try: regexp = util.re.compile(pattern, reflags) except re.error as inst: - ui.warn(_("grep: invalid match pattern: %s\n") % inst) + ui.warn(_("grep: invalid match pattern: %s\n") % pycompat.bytestr(inst)) return 1 sep, eol = ':', '\n' if opts.get('print0'): diff -r 149c5af35de5 -r 6e90c59b6da1 mercurial/debugcommands.py --- a/mercurial/debugcommands.py Thu Mar 01 23:52:30 2018 +0530 +++ b/mercurial/debugcommands.py Thu Mar 01 23:54:52 2018 +0530 @@ -1591,7 +1591,8 @@ metadata=metadata, ui=ui) tr.close() except ValueError as exc: - raise error.Abort(_('bad obsmarker input: %s') % exc) + raise error.Abort(_('bad obsmarker input: %s') % + pycompat.bytestr(exc)) finally: tr.release() finally: