mirror of
https://github.com/python/cpython
synced 2024-09-15 22:10:19 +00:00
Update pprint() to match the new repr style for frozensets
This commit is contained in:
parent
db96789ba7
commit
4b8db419c2
|
@ -175,13 +175,12 @@ def _format(self, object, stream, indent, allowance, context, level):
|
||||||
write('{')
|
write('{')
|
||||||
endchar = '}'
|
endchar = '}'
|
||||||
object = sorted(object)
|
object = sorted(object)
|
||||||
indent += 4
|
|
||||||
elif issubclass(typ, frozenset):
|
elif issubclass(typ, frozenset):
|
||||||
if not length:
|
if not length:
|
||||||
write('frozenset()')
|
write('frozenset()')
|
||||||
return
|
return
|
||||||
write('frozenset([')
|
write('frozenset({')
|
||||||
endchar = '])'
|
endchar = '})'
|
||||||
object = sorted(object)
|
object = sorted(object)
|
||||||
indent += 10
|
indent += 10
|
||||||
else:
|
else:
|
||||||
|
|
|
@ -197,186 +197,186 @@ def test_set_reprs(self):
|
||||||
self.assertEqual(pprint.pformat(frozenset(range(3))), 'frozenset({0, 1, 2})')
|
self.assertEqual(pprint.pformat(frozenset(range(3))), 'frozenset({0, 1, 2})')
|
||||||
cube_repr_tgt = """\
|
cube_repr_tgt = """\
|
||||||
{frozenset(): frozenset({frozenset({2}), frozenset({0}), frozenset({1})}),
|
{frozenset(): frozenset({frozenset({2}), frozenset({0}), frozenset({1})}),
|
||||||
frozenset({0}): frozenset([frozenset(),
|
frozenset({0}): frozenset({frozenset(),
|
||||||
frozenset({0, 2}),
|
frozenset({0, 2}),
|
||||||
frozenset({0, 1})]),
|
frozenset({0, 1})}),
|
||||||
frozenset({1}): frozenset([frozenset(),
|
frozenset({1}): frozenset({frozenset(),
|
||||||
frozenset({1, 2}),
|
frozenset({1, 2}),
|
||||||
frozenset({0, 1})]),
|
frozenset({0, 1})}),
|
||||||
frozenset({2}): frozenset([frozenset(),
|
frozenset({2}): frozenset({frozenset(),
|
||||||
frozenset({1, 2}),
|
frozenset({1, 2}),
|
||||||
frozenset({0, 2})]),
|
frozenset({0, 2})}),
|
||||||
frozenset({1, 2}): frozenset([frozenset({2}),
|
frozenset({1, 2}): frozenset({frozenset({2}),
|
||||||
frozenset({1}),
|
frozenset({1}),
|
||||||
frozenset({0, 1, 2})]),
|
frozenset({0, 1, 2})}),
|
||||||
frozenset({0, 2}): frozenset([frozenset({2}),
|
frozenset({0, 2}): frozenset({frozenset({2}),
|
||||||
frozenset({0}),
|
frozenset({0}),
|
||||||
frozenset({0, 1, 2})]),
|
frozenset({0, 1, 2})}),
|
||||||
frozenset({0, 1}): frozenset([frozenset({0}),
|
frozenset({0, 1}): frozenset({frozenset({0}),
|
||||||
frozenset({1}),
|
frozenset({1}),
|
||||||
frozenset({0, 1, 2})]),
|
frozenset({0, 1, 2})}),
|
||||||
frozenset({0, 1, 2}): frozenset([frozenset({1, 2}),
|
frozenset({0, 1, 2}): frozenset({frozenset({1, 2}),
|
||||||
frozenset({0, 2}),
|
frozenset({0, 2}),
|
||||||
frozenset({0, 1})])}"""
|
frozenset({0, 1})})}"""
|
||||||
cube = test.test_set.cube(3)
|
cube = test.test_set.cube(3)
|
||||||
self.assertEqual(pprint.pformat(cube), cube_repr_tgt)
|
self.assertEqual(pprint.pformat(cube), cube_repr_tgt)
|
||||||
cubo_repr_tgt = """\
|
cubo_repr_tgt = """\
|
||||||
{frozenset({frozenset({0, 2}), frozenset({0})}): frozenset([frozenset([frozenset([0,
|
{frozenset({frozenset({0, 2}), frozenset({0})}): frozenset({frozenset({frozenset({0,
|
||||||
2]),
|
2}),
|
||||||
frozenset([0,
|
frozenset({0,
|
||||||
1,
|
1,
|
||||||
2])]),
|
2})}),
|
||||||
frozenset([frozenset([0]),
|
frozenset({frozenset({0}),
|
||||||
frozenset([0,
|
frozenset({0,
|
||||||
1])]),
|
1})}),
|
||||||
frozenset([frozenset(),
|
frozenset({frozenset(),
|
||||||
frozenset([0])]),
|
frozenset({0})}),
|
||||||
frozenset([frozenset([2]),
|
frozenset({frozenset({2}),
|
||||||
frozenset([0,
|
frozenset({0,
|
||||||
2])])]),
|
2})})}),
|
||||||
frozenset({frozenset({0, 1}), frozenset({1})}): frozenset([frozenset([frozenset([0,
|
frozenset({frozenset({0, 1}), frozenset({1})}): frozenset({frozenset({frozenset({0,
|
||||||
1]),
|
1}),
|
||||||
frozenset([0,
|
frozenset({0,
|
||||||
1,
|
1,
|
||||||
2])]),
|
2})}),
|
||||||
frozenset([frozenset([0]),
|
frozenset({frozenset({0}),
|
||||||
frozenset([0,
|
frozenset({0,
|
||||||
1])]),
|
1})}),
|
||||||
frozenset([frozenset([1]),
|
frozenset({frozenset({1}),
|
||||||
frozenset([1,
|
frozenset({1,
|
||||||
2])]),
|
2})}),
|
||||||
frozenset([frozenset(),
|
frozenset({frozenset(),
|
||||||
frozenset([1])])]),
|
frozenset({1})})}),
|
||||||
frozenset({frozenset({1, 2}), frozenset({1})}): frozenset([frozenset([frozenset([1,
|
frozenset({frozenset({1, 2}), frozenset({1})}): frozenset({frozenset({frozenset({1,
|
||||||
2]),
|
2}),
|
||||||
frozenset([0,
|
frozenset({0,
|
||||||
1,
|
1,
|
||||||
2])]),
|
2})}),
|
||||||
frozenset([frozenset([2]),
|
frozenset({frozenset({2}),
|
||||||
frozenset([1,
|
frozenset({1,
|
||||||
2])]),
|
2})}),
|
||||||
frozenset([frozenset(),
|
frozenset({frozenset(),
|
||||||
frozenset([1])]),
|
frozenset({1})}),
|
||||||
frozenset([frozenset([1]),
|
frozenset({frozenset({1}),
|
||||||
frozenset([0,
|
frozenset({0,
|
||||||
1])])]),
|
1})})}),
|
||||||
frozenset({frozenset({1, 2}), frozenset({2})}): frozenset([frozenset([frozenset([1,
|
frozenset({frozenset({1, 2}), frozenset({2})}): frozenset({frozenset({frozenset({1,
|
||||||
2]),
|
2}),
|
||||||
frozenset([0,
|
frozenset({0,
|
||||||
1,
|
1,
|
||||||
2])]),
|
2})}),
|
||||||
frozenset([frozenset([1]),
|
frozenset({frozenset({1}),
|
||||||
frozenset([1,
|
frozenset({1,
|
||||||
2])]),
|
2})}),
|
||||||
frozenset([frozenset([2]),
|
frozenset({frozenset({2}),
|
||||||
frozenset([0,
|
frozenset({0,
|
||||||
2])]),
|
2})}),
|
||||||
frozenset([frozenset(),
|
frozenset({frozenset(),
|
||||||
frozenset([2])])]),
|
frozenset({2})})}),
|
||||||
frozenset({frozenset(), frozenset({0})}): frozenset([frozenset([frozenset([0]),
|
frozenset({frozenset(), frozenset({0})}): frozenset({frozenset({frozenset({0}),
|
||||||
frozenset([0,
|
frozenset({0,
|
||||||
1])]),
|
1})}),
|
||||||
frozenset([frozenset([0]),
|
frozenset({frozenset({0}),
|
||||||
frozenset([0,
|
frozenset({0,
|
||||||
2])]),
|
2})}),
|
||||||
frozenset([frozenset(),
|
frozenset({frozenset(),
|
||||||
frozenset([1])]),
|
frozenset({1})}),
|
||||||
frozenset([frozenset(),
|
frozenset({frozenset(),
|
||||||
frozenset([2])])]),
|
frozenset({2})})}),
|
||||||
frozenset({frozenset(), frozenset({1})}): frozenset([frozenset([frozenset(),
|
frozenset({frozenset(), frozenset({1})}): frozenset({frozenset({frozenset(),
|
||||||
frozenset([0])]),
|
frozenset({0})}),
|
||||||
frozenset([frozenset([1]),
|
frozenset({frozenset({1}),
|
||||||
frozenset([1,
|
frozenset({1,
|
||||||
2])]),
|
2})}),
|
||||||
frozenset([frozenset(),
|
frozenset({frozenset(),
|
||||||
frozenset([2])]),
|
frozenset({2})}),
|
||||||
frozenset([frozenset([1]),
|
frozenset({frozenset({1}),
|
||||||
frozenset([0,
|
frozenset({0,
|
||||||
1])])]),
|
1})})}),
|
||||||
frozenset({frozenset({2}), frozenset()}): frozenset([frozenset([frozenset([2]),
|
frozenset({frozenset({2}), frozenset()}): frozenset({frozenset({frozenset({2}),
|
||||||
frozenset([1,
|
frozenset({1,
|
||||||
2])]),
|
2})}),
|
||||||
frozenset([frozenset(),
|
frozenset({frozenset(),
|
||||||
frozenset([0])]),
|
frozenset({0})}),
|
||||||
frozenset([frozenset(),
|
frozenset({frozenset(),
|
||||||
frozenset([1])]),
|
frozenset({1})}),
|
||||||
frozenset([frozenset([2]),
|
frozenset({frozenset({2}),
|
||||||
frozenset([0,
|
frozenset({0,
|
||||||
2])])]),
|
2})})}),
|
||||||
frozenset({frozenset({0, 1, 2}), frozenset({0, 1})}): frozenset([frozenset([frozenset([1,
|
frozenset({frozenset({0, 1, 2}), frozenset({0, 1})}): frozenset({frozenset({frozenset({1,
|
||||||
2]),
|
2}),
|
||||||
frozenset([0,
|
frozenset({0,
|
||||||
1,
|
1,
|
||||||
2])]),
|
2})}),
|
||||||
frozenset([frozenset([0,
|
frozenset({frozenset({0,
|
||||||
2]),
|
2}),
|
||||||
frozenset([0,
|
frozenset({0,
|
||||||
1,
|
1,
|
||||||
2])]),
|
2})}),
|
||||||
frozenset([frozenset([0]),
|
frozenset({frozenset({0}),
|
||||||
frozenset([0,
|
frozenset({0,
|
||||||
1])]),
|
1})}),
|
||||||
frozenset([frozenset([1]),
|
frozenset({frozenset({1}),
|
||||||
frozenset([0,
|
frozenset({0,
|
||||||
1])])]),
|
1})})}),
|
||||||
frozenset({frozenset({0}), frozenset({0, 1})}): frozenset([frozenset([frozenset(),
|
frozenset({frozenset({0}), frozenset({0, 1})}): frozenset({frozenset({frozenset(),
|
||||||
frozenset([0])]),
|
frozenset({0})}),
|
||||||
frozenset([frozenset([0,
|
frozenset({frozenset({0,
|
||||||
1]),
|
1}),
|
||||||
frozenset([0,
|
frozenset({0,
|
||||||
1,
|
1,
|
||||||
2])]),
|
2})}),
|
||||||
frozenset([frozenset([0]),
|
frozenset({frozenset({0}),
|
||||||
frozenset([0,
|
frozenset({0,
|
||||||
2])]),
|
2})}),
|
||||||
frozenset([frozenset([1]),
|
frozenset({frozenset({1}),
|
||||||
frozenset([0,
|
frozenset({0,
|
||||||
1])])]),
|
1})})}),
|
||||||
frozenset({frozenset({2}), frozenset({0, 2})}): frozenset([frozenset([frozenset([0,
|
frozenset({frozenset({2}), frozenset({0, 2})}): frozenset({frozenset({frozenset({0,
|
||||||
2]),
|
2}),
|
||||||
frozenset([0,
|
frozenset({0,
|
||||||
1,
|
1,
|
||||||
2])]),
|
2})}),
|
||||||
frozenset([frozenset([2]),
|
frozenset({frozenset({2}),
|
||||||
frozenset([1,
|
frozenset({1,
|
||||||
2])]),
|
2})}),
|
||||||
frozenset([frozenset([0]),
|
frozenset({frozenset({0}),
|
||||||
frozenset([0,
|
frozenset({0,
|
||||||
2])]),
|
2})}),
|
||||||
frozenset([frozenset(),
|
frozenset({frozenset(),
|
||||||
frozenset([2])])]),
|
frozenset({2})})}),
|
||||||
frozenset({frozenset({0, 1, 2}), frozenset({0, 2})}): frozenset([frozenset([frozenset([1,
|
frozenset({frozenset({0, 1, 2}), frozenset({0, 2})}): frozenset({frozenset({frozenset({1,
|
||||||
2]),
|
2}),
|
||||||
frozenset([0,
|
frozenset({0,
|
||||||
1,
|
1,
|
||||||
2])]),
|
2})}),
|
||||||
frozenset([frozenset([0,
|
frozenset({frozenset({0,
|
||||||
1]),
|
1}),
|
||||||
frozenset([0,
|
frozenset({0,
|
||||||
1,
|
1,
|
||||||
2])]),
|
2})}),
|
||||||
frozenset([frozenset([0]),
|
frozenset({frozenset({0}),
|
||||||
frozenset([0,
|
frozenset({0,
|
||||||
2])]),
|
2})}),
|
||||||
frozenset([frozenset([2]),
|
frozenset({frozenset({2}),
|
||||||
frozenset([0,
|
frozenset({0,
|
||||||
2])])]),
|
2})})}),
|
||||||
frozenset({frozenset({1, 2}), frozenset({0, 1, 2})}): frozenset([frozenset([frozenset([0,
|
frozenset({frozenset({1, 2}), frozenset({0, 1, 2})}): frozenset({frozenset({frozenset({0,
|
||||||
2]),
|
2}),
|
||||||
frozenset([0,
|
frozenset({0,
|
||||||
1,
|
1,
|
||||||
2])]),
|
2})}),
|
||||||
frozenset([frozenset([0,
|
frozenset({frozenset({0,
|
||||||
1]),
|
1}),
|
||||||
frozenset([0,
|
frozenset({0,
|
||||||
1,
|
1,
|
||||||
2])]),
|
2})}),
|
||||||
frozenset([frozenset([2]),
|
frozenset({frozenset({2}),
|
||||||
frozenset([1,
|
frozenset({1,
|
||||||
2])]),
|
2})}),
|
||||||
frozenset([frozenset([1]),
|
frozenset({frozenset({1}),
|
||||||
frozenset([1,
|
frozenset({1,
|
||||||
2])])])}"""
|
2})})})}"""
|
||||||
|
|
||||||
cubo = test.test_set.linegraph(cube)
|
cubo = test.test_set.linegraph(cube)
|
||||||
self.assertEqual(pprint.pformat(cubo), cubo_repr_tgt)
|
self.assertEqual(pprint.pformat(cubo), cubo_repr_tgt)
|
||||||
|
|
Loading…
Reference in a new issue