This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3359

stringutil: make b prefixes on string output optional
ClosedPublic

Authored by durin42 on Apr 14 2018, 12:32 AM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHGf7194c925003: stringutil: make b prefixes on string output optional
Summary

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

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

durin42 created this revision.Apr 14 2018, 12:32 AM
durin42 updated this revision to Diff 8273.Apr 14 2018, 10:41 AM
indygreg accepted this revision.Apr 16 2018, 7:16 PM
This revision is now accepted and ready to land.Apr 16 2018, 7:16 PM
Closed by commit rHGf7194c925003: stringutil: make b prefixes on string output optional (authored by durin42). · Explain WhyApr 16 2018, 7:22 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/utils/stringutil.py (12 lines)

Diff 8353

mercurial/utils/stringutil.py

from ..thirdparty import attr from ..thirdparty import attr
from .. import ( from .. import (
encoding, encoding,
error, error,
pycompat, pycompat,
) )
def pprint(o): def pprint(o, bprefix=True):
"""Pretty print an object.""" """Pretty print an object."""
if isinstance(o, bytes): if isinstance(o, bytes):
if bprefix:
return "b'%s'" % escapestr(o) return "b'%s'" % escapestr(o)
return "'%s'" % escapestr(o)
elif isinstance(o, bytearray): elif isinstance(o, bytearray):
# codecs.escape_encode() can't handle bytearray, so escapestr fails # codecs.escape_encode() can't handle bytearray, so escapestr fails
# without coercion. # without coercion.
return "bytearray['%s']" % escapestr(bytes(o)) return "bytearray['%s']" % escapestr(bytes(o))
elif isinstance(o, list): 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): elif isinstance(o, dict):
return '{%s}' % (b', '.join( 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): elif isinstance(o, bool):
return b'True' if o else b'False' return b'True' if o else b'False'
elif isinstance(o, int): elif isinstance(o, int):
return '%d' % o return '%d' % o
elif isinstance(o, float): elif isinstance(o, float):
return '%f' % o return '%f' % o
elif o is None: elif o is None:
return b'None' return b'None'