parser: replace bespoke _brepr with stringutil.pprint
authorAugie Fackler <augie@google.com>
Fri, 10 Aug 2018 00:12:55 -0400
changeset 39050 0a2ce5b43574
parent 39049 b53ec524420b
child 39051 2aebe138ef6e
parser: replace bespoke _brepr with stringutil.pprint Differential Revision: https://phab.mercurial-scm.org/D4242
mercurial/parser.py
--- a/mercurial/parser.py	Fri Aug 10 02:06:46 2018 -0400
+++ b/mercurial/parser.py	Fri Aug 10 00:12:55 2018 -0400
@@ -20,7 +20,6 @@
 
 from .i18n import _
 from . import (
-    encoding,
     error,
     pycompat,
     util,
@@ -198,16 +197,11 @@
         # mangle Python's exception into our format
         raise error.ParseError(pycompat.bytestr(e).lower())
 
-def _brepr(obj):
-    if isinstance(obj, bytes):
-        return b"'%s'" % stringutil.escapestr(obj)
-    return encoding.strtolocal(repr(obj))
-
 def _prettyformat(tree, leafnodes, level, lines):
     if not isinstance(tree, tuple):
-        lines.append((level, _brepr(tree)))
+        lines.append((level, stringutil.pprint(tree)))
     elif tree[0] in leafnodes:
-        rs = map(_brepr, tree[1:])
+        rs = map(stringutil.pprint, tree[1:])
         lines.append((level, '(%s %s)' % (tree[0], ' '.join(rs))))
     else:
         lines.append((level, '(%s' % tree[0]))