From 4b8db419c278215ac1c79f4aac2b1453b13e8c83 Mon Sep 17 00:00:00 2001 From: Raymond Hettinger Date: Thu, 31 Jan 2008 01:10:03 +0000 Subject: [PATCH] Update pprint() to match the new repr style for frozensets --- Lib/pprint.py | 5 +- Lib/test/test_pprint.py | 316 ++++++++++++++++++++-------------------- 2 files changed, 160 insertions(+), 161 deletions(-) diff --git a/Lib/pprint.py b/Lib/pprint.py index b903391db2b..43b6b0d11ea 100644 --- a/Lib/pprint.py +++ b/Lib/pprint.py @@ -175,13 +175,12 @@ def _format(self, object, stream, indent, allowance, context, level): write('{') endchar = '}' object = sorted(object) - indent += 4 elif issubclass(typ, frozenset): if not length: write('frozenset()') return - write('frozenset([') - endchar = '])' + write('frozenset({') + endchar = '})' object = sorted(object) indent += 10 else: diff --git a/Lib/test/test_pprint.py b/Lib/test/test_pprint.py index 8d75d58fe62..a0cd01a0d04 100644 --- a/Lib/test/test_pprint.py +++ b/Lib/test/test_pprint.py @@ -197,186 +197,186 @@ def test_set_reprs(self): 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(), + frozenset({0}): frozenset({frozenset(), frozenset({0, 2}), - frozenset({0, 1})]), - frozenset({1}): frozenset([frozenset(), + frozenset({0, 1})}), + frozenset({1}): frozenset({frozenset(), frozenset({1, 2}), - frozenset({0, 1})]), - frozenset({2}): frozenset([frozenset(), + frozenset({0, 1})}), + frozenset({2}): frozenset({frozenset(), frozenset({1, 2}), - frozenset({0, 2})]), - frozenset({1, 2}): frozenset([frozenset({2}), + frozenset({0, 2})}), + frozenset({1, 2}): frozenset({frozenset({2}), frozenset({1}), - frozenset({0, 1, 2})]), - frozenset({0, 2}): frozenset([frozenset({2}), + frozenset({0, 1, 2})}), + frozenset({0, 2}): frozenset({frozenset({2}), frozenset({0}), - frozenset({0, 1, 2})]), - frozenset({0, 1}): frozenset([frozenset({0}), + frozenset({0, 1, 2})}), + frozenset({0, 1}): frozenset({frozenset({0}), frozenset({1}), - frozenset({0, 1, 2})]), - frozenset({0, 1, 2}): frozenset([frozenset({1, 2}), + frozenset({0, 1, 2})}), + frozenset({0, 1, 2}): frozenset({frozenset({1, 2}), frozenset({0, 2}), - frozenset({0, 1})])}""" + frozenset({0, 1})})}""" cube = test.test_set.cube(3) self.assertEqual(pprint.pformat(cube), cube_repr_tgt) cubo_repr_tgt = """\ -{frozenset({frozenset({0, 2}), frozenset({0})}): frozenset([frozenset([frozenset([0, - 2]), - frozenset([0, +{frozenset({frozenset({0, 2}), frozenset({0})}): frozenset({frozenset({frozenset({0, + 2}), + frozenset({0, 1, - 2])]), - frozenset([frozenset([0]), - frozenset([0, - 1])]), - frozenset([frozenset(), - frozenset([0])]), - frozenset([frozenset([2]), - frozenset([0, - 2])])]), - frozenset({frozenset({0, 1}), frozenset({1})}): frozenset([frozenset([frozenset([0, - 1]), - frozenset([0, + 2})}), + frozenset({frozenset({0}), + frozenset({0, + 1})}), + frozenset({frozenset(), + frozenset({0})}), + frozenset({frozenset({2}), + frozenset({0, + 2})})}), + frozenset({frozenset({0, 1}), frozenset({1})}): frozenset({frozenset({frozenset({0, + 1}), + frozenset({0, 1, - 2])]), - frozenset([frozenset([0]), - frozenset([0, - 1])]), - frozenset([frozenset([1]), - frozenset([1, - 2])]), - frozenset([frozenset(), - frozenset([1])])]), - frozenset({frozenset({1, 2}), frozenset({1})}): frozenset([frozenset([frozenset([1, - 2]), - frozenset([0, + 2})}), + frozenset({frozenset({0}), + frozenset({0, + 1})}), + frozenset({frozenset({1}), + frozenset({1, + 2})}), + frozenset({frozenset(), + frozenset({1})})}), + frozenset({frozenset({1, 2}), frozenset({1})}): frozenset({frozenset({frozenset({1, + 2}), + frozenset({0, 1, - 2])]), - frozenset([frozenset([2]), - frozenset([1, - 2])]), - frozenset([frozenset(), - frozenset([1])]), - frozenset([frozenset([1]), - frozenset([0, - 1])])]), - frozenset({frozenset({1, 2}), frozenset({2})}): frozenset([frozenset([frozenset([1, - 2]), - frozenset([0, + 2})}), + frozenset({frozenset({2}), + frozenset({1, + 2})}), + frozenset({frozenset(), + frozenset({1})}), + frozenset({frozenset({1}), + frozenset({0, + 1})})}), + frozenset({frozenset({1, 2}), frozenset({2})}): frozenset({frozenset({frozenset({1, + 2}), + frozenset({0, 1, - 2])]), - frozenset([frozenset([1]), - frozenset([1, - 2])]), - frozenset([frozenset([2]), - frozenset([0, - 2])]), - frozenset([frozenset(), - frozenset([2])])]), - frozenset({frozenset(), frozenset({0})}): frozenset([frozenset([frozenset([0]), - frozenset([0, - 1])]), - frozenset([frozenset([0]), - frozenset([0, - 2])]), - frozenset([frozenset(), - frozenset([1])]), - frozenset([frozenset(), - frozenset([2])])]), - frozenset({frozenset(), frozenset({1})}): frozenset([frozenset([frozenset(), - frozenset([0])]), - frozenset([frozenset([1]), - frozenset([1, - 2])]), - frozenset([frozenset(), - frozenset([2])]), - frozenset([frozenset([1]), - frozenset([0, - 1])])]), - frozenset({frozenset({2}), frozenset()}): frozenset([frozenset([frozenset([2]), - frozenset([1, - 2])]), - frozenset([frozenset(), - frozenset([0])]), - frozenset([frozenset(), - frozenset([1])]), - frozenset([frozenset([2]), - frozenset([0, - 2])])]), - frozenset({frozenset({0, 1, 2}), frozenset({0, 1})}): frozenset([frozenset([frozenset([1, - 2]), - frozenset([0, + 2})}), + frozenset({frozenset({1}), + frozenset({1, + 2})}), + frozenset({frozenset({2}), + frozenset({0, + 2})}), + frozenset({frozenset(), + frozenset({2})})}), + frozenset({frozenset(), frozenset({0})}): frozenset({frozenset({frozenset({0}), + frozenset({0, + 1})}), + frozenset({frozenset({0}), + frozenset({0, + 2})}), + frozenset({frozenset(), + frozenset({1})}), + frozenset({frozenset(), + frozenset({2})})}), + frozenset({frozenset(), frozenset({1})}): frozenset({frozenset({frozenset(), + frozenset({0})}), + frozenset({frozenset({1}), + frozenset({1, + 2})}), + frozenset({frozenset(), + frozenset({2})}), + frozenset({frozenset({1}), + frozenset({0, + 1})})}), + frozenset({frozenset({2}), frozenset()}): frozenset({frozenset({frozenset({2}), + frozenset({1, + 2})}), + frozenset({frozenset(), + frozenset({0})}), + frozenset({frozenset(), + frozenset({1})}), + frozenset({frozenset({2}), + frozenset({0, + 2})})}), + frozenset({frozenset({0, 1, 2}), frozenset({0, 1})}): frozenset({frozenset({frozenset({1, + 2}), + frozenset({0, 1, - 2])]), - frozenset([frozenset([0, - 2]), - frozenset([0, + 2})}), + frozenset({frozenset({0, + 2}), + frozenset({0, 1, - 2])]), - frozenset([frozenset([0]), - frozenset([0, - 1])]), - frozenset([frozenset([1]), - frozenset([0, - 1])])]), - frozenset({frozenset({0}), frozenset({0, 1})}): frozenset([frozenset([frozenset(), - frozenset([0])]), - frozenset([frozenset([0, - 1]), - frozenset([0, + 2})}), + frozenset({frozenset({0}), + frozenset({0, + 1})}), + frozenset({frozenset({1}), + frozenset({0, + 1})})}), + frozenset({frozenset({0}), frozenset({0, 1})}): frozenset({frozenset({frozenset(), + frozenset({0})}), + frozenset({frozenset({0, + 1}), + frozenset({0, 1, - 2])]), - frozenset([frozenset([0]), - frozenset([0, - 2])]), - frozenset([frozenset([1]), - frozenset([0, - 1])])]), - frozenset({frozenset({2}), frozenset({0, 2})}): frozenset([frozenset([frozenset([0, - 2]), - frozenset([0, + 2})}), + frozenset({frozenset({0}), + frozenset({0, + 2})}), + frozenset({frozenset({1}), + frozenset({0, + 1})})}), + frozenset({frozenset({2}), frozenset({0, 2})}): frozenset({frozenset({frozenset({0, + 2}), + frozenset({0, 1, - 2])]), - frozenset([frozenset([2]), - frozenset([1, - 2])]), - frozenset([frozenset([0]), - frozenset([0, - 2])]), - frozenset([frozenset(), - frozenset([2])])]), - frozenset({frozenset({0, 1, 2}), frozenset({0, 2})}): frozenset([frozenset([frozenset([1, - 2]), - frozenset([0, + 2})}), + frozenset({frozenset({2}), + frozenset({1, + 2})}), + frozenset({frozenset({0}), + frozenset({0, + 2})}), + frozenset({frozenset(), + frozenset({2})})}), + frozenset({frozenset({0, 1, 2}), frozenset({0, 2})}): frozenset({frozenset({frozenset({1, + 2}), + frozenset({0, 1, - 2])]), - frozenset([frozenset([0, - 1]), - frozenset([0, + 2})}), + frozenset({frozenset({0, + 1}), + frozenset({0, 1, - 2])]), - frozenset([frozenset([0]), - frozenset([0, - 2])]), - frozenset([frozenset([2]), - frozenset([0, - 2])])]), - frozenset({frozenset({1, 2}), frozenset({0, 1, 2})}): frozenset([frozenset([frozenset([0, - 2]), - frozenset([0, + 2})}), + frozenset({frozenset({0}), + frozenset({0, + 2})}), + frozenset({frozenset({2}), + frozenset({0, + 2})})}), + frozenset({frozenset({1, 2}), frozenset({0, 1, 2})}): frozenset({frozenset({frozenset({0, + 2}), + frozenset({0, 1, - 2])]), - frozenset([frozenset([0, - 1]), - frozenset([0, + 2})}), + frozenset({frozenset({0, + 1}), + frozenset({0, 1, - 2])]), - frozenset([frozenset([2]), - frozenset([1, - 2])]), - frozenset([frozenset([1]), - frozenset([1, - 2])])])}""" + 2})}), + frozenset({frozenset({2}), + frozenset({1, + 2})}), + frozenset({frozenset({1}), + frozenset({1, + 2})})})}""" cubo = test.test_set.linegraph(cube) self.assertEqual(pprint.pformat(cubo), cubo_repr_tgt)