Patchwork D2541: verify: fix exception formatting bug in Python 3

login
register
mail settings
Submitter phabricator
Date March 2, 2018, 5:10 p.m.
Message ID <aed8c58683be2abfd79e15862c6316c2@localhost.localdomain>
Download mbox | patch
Permalink /patch/28700/
State Not Applicable
Headers show

Comments

phabricator - March 2, 2018, 5:10 p.m.
durin42 updated this revision to Diff 6364.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D2541?vs=6331&id=6364

REVISION DETAIL
  https://phab.mercurial-scm.org/D2541

AFFECTED FILES
  mercurial/verify.py

CHANGE DETAILS




To: durin42, #hg-reviewers, pulkit, yuja
Cc: yuja, mercurial-devel

Patch

diff --git a/mercurial/verify.py b/mercurial/verify.py
--- a/mercurial/verify.py
+++ b/mercurial/verify.py
@@ -70,8 +70,9 @@ 
         self.errors += 1
 
     def exc(self, linkrev, msg, inst, filename=None):
-        if not str(inst):
-            inst = repr(inst)
+        fmsg = pycompat.bytestr(inst)
+        if not fmsg:
+            fmsg = pycompat.byterepr(inst)
         self.err(linkrev, "%s: %s" % (msg, inst), filename)
 
     def checklog(self, obj, name, linkrev):