[Python-checkins] cpython (3.3): Issue #19137: The pprint module now correctly formats instances of set and
serhiy.storchaka
python-checkins at python.org
Wed Oct 2 10:45:51 CEST 2013
http://hg.python.org/cpython/rev/65943dc15afc
changeset: 85919:65943dc15afc
branch: 3.3
parent: 85916:1ee6f8a96fb9
user: Serhiy Storchaka <storchaka at gmail.com>
date: Wed Oct 02 11:40:49 2013 +0300
summary:
Issue #19137: The pprint module now correctly formats instances of set and
frozenset subclasses.
files:
Lib/pprint.py | 30 +++++-----
Lib/test/test_pprint.py | 79 ++++++++++++++++++++++++----
Misc/NEWS | 3 +
3 files changed, 84 insertions(+), 28 deletions(-)
diff --git a/Lib/pprint.py b/Lib/pprint.py
--- a/Lib/pprint.py
+++ b/Lib/pprint.py
@@ -205,24 +205,22 @@
if issubclass(typ, list):
write('[')
endchar = ']'
- elif issubclass(typ, set):
- if not length:
- write('set()')
- return
- write('{')
- endchar = '}'
- object = sorted(object, key=_safe_key)
- elif issubclass(typ, frozenset):
- if not length:
- write('frozenset()')
- return
- write('frozenset({')
- endchar = '})'
- object = sorted(object, key=_safe_key)
- indent += 10
- else:
+ elif issubclass(typ, tuple):
write('(')
endchar = ')'
+ else:
+ if not length:
+ write(rep)
+ return
+ if typ is set:
+ write('{')
+ endchar = '}'
+ else:
+ write(typ.__name__)
+ write('({')
+ endchar = '})'
+ indent += len(typ.__name__) + 1
+ object = sorted(object, key=_safe_key)
if self._indent_per_level > 1:
write((self._indent_per_level - 1) * ' ')
if length:
diff --git a/Lib/test/test_pprint.py b/Lib/test/test_pprint.py
--- a/Lib/test/test_pprint.py
+++ b/Lib/test/test_pprint.py
@@ -21,6 +21,20 @@
def __repr__(self):
return tuple.__repr__(self)
+class set2(set):
+ pass
+
+class set3(set):
+ def __repr__(self):
+ return set.__repr__(self)
+
+class frozenset2(frozenset):
+ pass
+
+class frozenset3(frozenset):
+ def __repr__(self):
+ return frozenset.__repr__(self)
+
class dict2(dict):
pass
@@ -115,22 +129,24 @@
for simple in (0, 0, 0+0j, 0.0, "", b"",
(), tuple2(), tuple3(),
[], list2(), list3(),
+ set(), set2(), set3(),
+ frozenset(), frozenset2(), frozenset3(),
{}, dict2(), dict3(),
self.assertTrue, pprint,
-6, -6, -6-6j, -1.5, "x", b"x", (3,), [3], {3: 6},
(1,2), [3,4], {5: 6},
tuple2((1,2)), tuple3((1,2)), tuple3(range(100)),
[3,4], list2([3,4]), list3([3,4]), list3(range(100)),
+ set({7}), set2({7}), set3({7}),
+ frozenset({8}), frozenset2({8}), frozenset3({8}),
dict2({5: 6}), dict3({5: 6}),
range(10, -11, -1)
):
native = repr(simple)
- for function in "pformat", "saferepr":
- f = getattr(pprint, function)
- got = f(simple)
- self.assertEqual(native, got,
- "expected %s got %s from pprint.%s" %
- (native, got, function))
+ self.assertEqual(pprint.pformat(simple), native)
+ self.assertEqual(pprint.pformat(simple, width=1, indent=0)
+ .replace('\n', ' '), native)
+ self.assertEqual(pprint.saferepr(simple), native)
def test_basic_line_wrap(self):
# verify basic line-wrapping operation
@@ -219,10 +235,54 @@
others.should.not.be: like.this}"""
self.assertEqual(DottedPrettyPrinter().pformat(o), exp)
+ def test_set_reprs(self):
+ self.assertEqual(pprint.pformat(set()), 'set()')
+ self.assertEqual(pprint.pformat(set(range(3))), '{0, 1, 2}')
+ self.assertEqual(pprint.pformat(set(range(7)), width=20), '''\
+{0,
+ 1,
+ 2,
+ 3,
+ 4,
+ 5,
+ 6}''')
+ self.assertEqual(pprint.pformat(set2(range(7)), width=20), '''\
+set2({0,
+ 1,
+ 2,
+ 3,
+ 4,
+ 5,
+ 6})''')
+ self.assertEqual(pprint.pformat(set3(range(7)), width=20),
+ 'set3({0, 1, 2, 3, 4, 5, 6})')
+
+ self.assertEqual(pprint.pformat(frozenset()), 'frozenset()')
+ self.assertEqual(pprint.pformat(frozenset(range(3))),
+ 'frozenset({0, 1, 2})')
+ self.assertEqual(pprint.pformat(frozenset(range(7)), width=20), '''\
+frozenset({0,
+ 1,
+ 2,
+ 3,
+ 4,
+ 5,
+ 6})''')
+ self.assertEqual(pprint.pformat(frozenset2(range(7)), width=20), '''\
+frozenset2({0,
+ 1,
+ 2,
+ 3,
+ 4,
+ 5,
+ 6})''')
+ self.assertEqual(pprint.pformat(frozenset3(range(7)), width=20),
+ 'frozenset3({0, 1, 2, 3, 4, 5, 6})')
+
@unittest.expectedFailure
#See http://bugs.python.org/issue13907
@test.support.cpython_only
- def test_set_reprs(self):
+ def test_set_of_sets_reprs(self):
# This test creates a complex arrangement of frozensets and
# compares the pretty-printed repr against a string hard-coded in
# the test. The hard-coded repr depends on the sort order of
@@ -245,11 +305,6 @@
# algorithm cause the test to fail when it should pass.
# XXX Or changes to the dictionary implmentation...
- self.assertEqual(pprint.pformat(set()), 'set()')
- self.assertEqual(pprint.pformat(set(range(3))), '{0, 1, 2}')
- self.assertEqual(pprint.pformat(frozenset()), 'frozenset()')
-
- self.assertEqual(pprint.pformat(frozenset(range(3))), 'frozenset({0, 1, 2})')
cube_repr_tgt = """\
{frozenset(): frozenset({frozenset({2}), frozenset({0}), frozenset({1})}),
frozenset({0}): frozenset({frozenset(),
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -71,6 +71,9 @@
Library
-------
+- Issue #19137: The pprint module now correctly formats instances of set and
+ frozenset subclasses.
+
- Issue #19092: contextlib.ExitStack now correctly reraises exceptions
from the __exit__ callbacks of inner context managers (Patch by Hrvoje
Nikšić)
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list