8000 bpo-28850: Fix PrettyPrinter.format overrides being ignored for contents of small containers by iritkatriel · Pull Request #22120 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

bpo-28850: Fix PrettyPrinter.format overrides being ignored for contents of small containers #22120

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
merged 9 commits into from
Nov 23, 2020
Merged

bpo-28850: Fix PrettyPrinter.format overrides being ignored for contents of small containers #22120

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
0b849c2
bpo-28850: add small objects to the subclassing unit test, expecting …
iritkatriel Sep 5, 2020
f6c2c19
bpo-28850: indent _safe_repr under an 'if True:' as prep for making i…
iritkatriel Sep 5, 2020
fcf7747
bpo-28850: make _safe_repr a method of PrettyPrinter
iritkatriel Sep 6, 2020
ad9686f
bpo-28850: make _safe_repr call self.format when it needs to recurse …
iritkatriel Sep 6, 2020
78262b1
📜🤖 Added by blurb_it.
blurb-it[bot] Sep 6, 2020
5de64c4
Delete 2020-09-06-16-37-54.bpo-issue28850.HJNggD.rst
iritkatriel Sep 6, 2020
3d7ced7
📜🤖 Added by blurb_it.
blurb-it[bot] Sep 6, 2020
2e1c705
Zackery's review comments (the easy ones)
iritkatriel Nov 5, 2020
f46af4d
Update 2020-09-06-21-55-44.bpo-28850.HJNggD.rst
iritkatriel Nov 23, 2020
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
Zackery's review comments (the easy ones)
  • Loading branch information
@iritkatriel
iritkatriel committed Nov 5, 2020
commit 2e1c705e79d631fc17e491427cf58563bf712205
9 changes: 6 additions & 3 deletions Lib/pprint.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -544,8 +544,10 @@ def _safe_repr(self, object, context, maxlevels, level):
else:
items = object.items()
for k, v in items:
krepr, kreadable, krecur = self.format(k, context, maxlevels, level)
vrepr, vreadable, vrecur = self.format(v, context, maxlevels, level)
krepr, kreadable, krecur = self.format(
k, context, maxlevels, level)
vrepr, vreadable, vrecur = self.format(
v, context, maxlevels, level)
append("%s: %s" % (krepr, vrepr))
readable = readable and kreadable and vreadable
if krecur or vrecur:
Expand Down Expand Up @@ -577,7 +579,8 @@ def _safe_repr(self, object, context, maxlevels, level):
append = components.append
level += 1
for o in object:
orepr, oreadable, orecur = self.format(o, context, maxlevels, level)
orepr, oreadable, orecur = self.format(
o, context, maxlevels, level)
append(orepr)
if not oreadable:
readable = False
Expand Down
8 changes: 5 additions & 3 deletions Lib/test/test_pprint.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -459,15 +459,17 @@ def test_subclassing(self):
exp = """\
{'names with spaces': 'should be presented using repr()',
others.should.not.be: like.this}"""
self.assertEqual(DottedPrettyPrinter().pformat(o), exp)

dotted_printer = DottedPrettyPrinter()
self.assertEqual(dotted_printer.pformat(o), exp)

# length(repr(obj)) < width
o1 = ['with space']
exp1 = "['with space']"
self.assertEqual(DottedPrettyPrinter().pformat(o1), exp1)
self.assertEqual(dotted_printer.pformat(o1), exp1)
o2 = ['without.space']
exp2 = "[without.space]"
self.assertEqual(DottedPrettyPrinter().pformat(o2), exp2)
self.assertEqual(dotted_printer.pformat(o2), exp2)

def test_set_reprs(self):
self.assertEqual(pprint.pformat(set()), 'set()')
Expand Down
2 changes: 1 addition & 1 deletion Misc/NEWS.d/next/Library/2020-09-06-21-55-44.bpo-28850.HJNggD.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Fix PrettyPrinter.format overrides being ignored for contents of small containers.
Fix :meth:`pprint.PrettyPrinter.format` overrides being ignored for contents of small containers.
0