Patchwork [04,of,10] py3: drop b'' from error message generated by templater.runmember()

login
register
mail settings
Submitter Yuya Nishihara
Date March 2, 2018, 12:26 a.m.
Message ID <47a09e779081aed56301.1519950383@mimosa>
Download mbox | patch
Permalink /patch/28628/
State Accepted
Headers show

Comments

Yuya Nishihara - March 2, 2018, 12:26 a.m.
# HG changeset patch
# User Yuya Nishihara <yuya@tcha.org>
# Date 1519941137 18000
#      Thu Mar 01 16:52:17 2018 -0500
# Node ID 47a09e779081aed563018208407c771ede557ffd
# Parent  7f0a461c110f7d953dda945dfe9c0912865f8e91
py3: drop b'' from error message generated by templater.runmember()

Patch

diff --git a/mercurial/templater.py b/mercurial/templater.py
--- a/mercurial/templater.py
+++ b/mercurial/templater.py
@@ -548,7 +548,7 @@  def runmember(context, mapping, data):
     if sym:
         raise error.ParseError(_("keyword '%s' has no member") % sym)
     else:
-        raise error.ParseError(_("%r has no member") % d)
+        raise error.ParseError(_("%r has no member") % pycompat.bytestr(d))
 
 def buildnegate(exp, context):
     arg = compileexp(exp[1], context, exprmethods)