Skip to content

C
cpython
Kaydet (Commit) 4b8db419 authored tarafından Raymond Hettinger's avatar Raymond Hettinger
Dosyalara gözat
Seçenekler

Update pprint() to match the new repr style for frozensets

üst db96789b
Hide whitespace changes
Inline Side-by-side
Showing with 160 additions and 161 deletions
Lib/pprint.py
Dosyayı görüntüle @ 4b8db419
...@@ -175,13 +175,12 @@ class PrettyPrinter: ...@@ -175,13 +175,12 @@ class PrettyPrinter:
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:
......
Lib/test/test_pprint.py
Dosyayı görüntüle @ 4b8db419
...@@ -197,186 +197,186 @@ class QueryTestCase(unittest.TestCase): ...@@ -197,186 +197,186 @@ class QueryTestCase(unittest.TestCase):
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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment