This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3302

stringutil: support more types with pprint()
ClosedPublic

Authored by indygreg on Apr 13 2018, 2:26 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG68132a95df31: stringutil: support more types with pprint()
Summary

bytearray wasn't working. Integers and floats were not being
formatted.

I /think/ %f is portable across both Python 2 and 3, as it should
default to 6 decimal points on each.

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.

Revision Contents
Changeset List

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

Diff 8109

mercurial/utils/stringutil.py

from .. import ( from .. import (
encoding, encoding,
error, error,
pycompat, pycompat,
) )
def pprint(o): def pprint(o):
"""Pretty print an object.""" """Pretty print an object."""
if isinstance(o, (bytes, bytearray)): if isinstance(o, bytes):
return "b'%s'" % escapestr(o) return "b'%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): elif isinstance(o, list):
return '[%s]' % (b', '.join(pprint(a) for a in o)) return '[%s]' % (b', '.join(pprint(a) 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), pprint(v)) 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):
return '%d' % o
elif isinstance(o, float):
return '%f' % o
else: else:
raise error.ProgrammingError('do not know how to format %r' % o) raise error.ProgrammingError('do not know how to format %r' % o)
def binary(s): def binary(s):
"""return true if a string is binary data""" """return true if a string is binary data"""
return bool(s and '\0' in s) return bool(s and '\0' in s)
def stringmatcher(pattern, casesensitive=True): def stringmatcher(pattern, casesensitive=True):