Patchwork D3359: stringutil: make b prefixes on string output optional

login
register
mail settings
Submitter phabricator
Date April 14, 2018, 4:32 a.m.
Message ID <differential-rev-PHID-DREV-k6v4v42tuxyytqak7bk3-req@phab.mercurial-scm.org>
Download mbox | patch
Permalink /patch/30983/
State Superseded
Headers show

Comments

phabricator - April 14, 2018, 4:32 a.m.
durin42 created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  I need this to preserve some behavior in hook.py.

REPOSITORY
  rHG Mercurial

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

AFFECTED FILES
  mercurial/utils/stringutil.py

CHANGE DETAILS




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

Patch

diff --git a/mercurial/utils/stringutil.py b/mercurial/utils/stringutil.py
--- a/mercurial/utils/stringutil.py
+++ b/mercurial/utils/stringutil.py
@@ -23,19 +23,23 @@ 
     pycompat,
 )
 
-def pprint(o):
+def pprint(o, bprefix=True):
     """Pretty print an object."""
     if isinstance(o, bytes):
-        return "b'%s'" % escapestr(o)
+        if bprefix:
+            return "b'%s'" % escapestr(o)
+        return "'%s'" % escapestr(o)
     elif isinstance(o, bytearray):
         # codecs.escape_encode() can't handle bytearray, so escapestr fails
         # without coercion.
         return "bytearray['%s']" % escapestr(bytes(o))
     elif isinstance(o, list):
-        return '[%s]' % (b', '.join(pprint(a) for a in o))
+        return '[%s]' % (b', '.join(pprint(a, bprefix=bprefix) for a in o))
     elif isinstance(o, dict):
         return '{%s}' % (b', '.join(
-            '%s: %s' % (pprint(k), pprint(v)) for k, v in sorted(o.items())))
+            '%s: %s' % (pprint(k, bprefix=bprefix),
+                        pprint(v, bprefix=bprefix))
+            for k, v in sorted(o.items())))
     elif isinstance(o, bool):
         return b'True' if o else b'False'
     elif isinstance(o, int):