From patchwork Fri Mar 2 00:26:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [04, of, 10] py3: drop b'' from error message generated by templater.runmember() From: Yuya Nishihara X-Patchwork-Id: 28628 Message-Id: <47a09e779081aed56301.1519950383@mimosa> To: mercurial-devel@mercurial-scm.org Date: Thu, 01 Mar 2018 19:26:23 -0500 # HG changeset patch # User Yuya Nishihara # 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() 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)