Skip to content

gh-118761: Improve import time of pprint #122725

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hugovk merged 5 commits into from
Aug 7, 2024
Merged

gh-118761: Improve import time of pprint #122725

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c9533e6
Improve import time of pprint
hugovk Aug 5, 2024
f65cb1e
Add blurb
hugovk Aug 6, 2024
40f6d2e
PEP 8: add whitespace
hugovk Aug 6, 2024
07cffca
Apply suggestions from code review
hugovk Aug 7, 2024
397f05b
Apply suggestions from code review
hugovk Aug 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
PEP 8: add whitespace
  • Loading branch information
@hugovk
hugovk committed Aug 6, 2024
commit 40f6d2e3368d05f49d60416885085a997ded589f
10 changes: 10 additions & 0 deletions Lib/pprint.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,29 +52,35 @@ def pprint(object, stream=None, indent=1, width=80, depth=None, *,
underscore_numbers=underscore_numbers)
printer.pprint(object)


def pformat(object, indent=1, width=80, depth=None, *,
compact=False, sort_dicts=True, underscore_numbers=False):
"""Format a Python object into a pretty-printed representation."""
return PrettyPrinter(indent=indent, width=width, depth=depth,
compact=compact, sort_dicts=sort_dicts,
underscore_numbers=underscore_numbers).pformat(object)


def pp(object, *args, sort_dicts=False, **kwargs):
"""Pretty-print a Python object"""
pprint(object, *args, sort_dicts=sort_dicts, **kwargs)


def saferepr(object):
"""Version of repr() which can handle recursive data structures."""
return PrettyPrinter()._safe_repr(object, {}, None, 0)[0]


def isreadable(object):
"""Determine if saferepr(object) is readable by eval()."""
return PrettyPrinter()._safe_repr(object, {}, None, 0)[1]


def isrecursive(object):
"""Determine if object requires a recursive representation."""
return PrettyPrinter()._safe_repr(object, {}, None, 0)[2]


class _safe_key:
"""Helper function for key functions when sorting unorderable objects.

Expand All @@ -97,10 +103,12 @@ def __lt__(self, other):
return ((str(type(self.obj)), id(self.obj)) < \
(str(type(other.obj)), id(other.obj)))


def _safe_tuple(t):
"Helper function for comparing 2-tuples"
return _safe_key(t[0]), _safe_key(t[1])


class PrettyPrinter:
def __init__(self, indent=1, width=80, depth=None, stream=None, *,
compact=False, sort_dicts=True, underscore_numbers=False):
Expand Down Expand Up @@ -639,9 +647,11 @@ def _safe_repr(self, object, context, maxlevels, level):
rep = repr(object)
return rep, (rep and not rep.startswith('<')), False


_builtin_scalars = frozenset({str, bytes, bytearray, float, complex,
bool, type(None)})


def _recursion(object):
return ("<Recursion on %s with id=%s>"
% (type(object).__name__, id(object)))
Expand Down