Author: raymond.hettinger
Date: Thu Jan 31 02:10:03 2008
New Revision: 60468
Modified:
python/branches/py3k/Lib/pprint.py
python/branches/py3k/Lib/test/test_pprint.py
Log:
Update pprint() to match the new repr style for frozensets
Modified: python/branches/py3k/Lib/pprint.py
==============================================================================
--- python/branches/py3k/Lib/pprint.py (original)
+++ python/branches/py3k/Lib/pprint.py Thu Jan 31 02:10:03 2008
@@ -175,13 +175,12 @@
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:
Modified: python/branches/py3k/Lib/test/test_pprint.py
==============================================================================
--- python/branches/py3k/Lib/test/test_pprint.py (original)
+++ python/branches/py3k/Lib/test/test_pprint.py Thu Jan 31 02:10:03 2008
@@ -197,186 +197,186 @@
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,
- 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,
- 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,
- 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,
- 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,
- 1,
- 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,
- 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,
- 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,
- 1,
- 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,
- 1,
- 2])]),
- frozenset([frozenset([0,
- 1]),
- frozenset([0,
- 1,
- 2])]),
- frozenset([frozenset([2]),
- frozenset([1,
- 2])]),
- frozenset([frozenset([1]),
- frozenset([1,
- 2])])])}"""
+{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,
+ 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,
+ 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,
+ 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,
+ 1,
+ 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,
+ 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,
+ 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,
+ 1,
+ 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,
+ 1,
+ 2})}),
+ frozenset({frozenset({0,
+ 1}),
+ frozenset({0,
+ 1,
+ 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)