D2516: py3: use pycompat.bytestr() to convert error instances to bytes
pulkit (Pulkit Goyal)
phabricator at mercurial-scm.org
Thu Mar 1 18:50:07 UTC 2018
pulkit created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D2516
AFFECTED FILES
mercurial/commands.py
mercurial/debugcommands.py
CHANGE DETAILS
diff --git a/mercurial/debugcommands.py b/mercurial/debugcommands.py
--- a/mercurial/debugcommands.py
+++ b/mercurial/debugcommands.py
@@ -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:
diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -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'):
To: pulkit, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list