mirror of
https://github.com/python/cpython.git
synced 2025-11-01 02:38:53 +00:00
Shorter pprint's for empty sets and frozensets. Fix indentation of frozensets. Add tests including two complex data structures.
This commit is contained in:
parent
6170874f9c
commit
5310b69419
2 changed files with 200 additions and 2 deletions
|
|
@ -1,6 +1,7 @@
|
|||
import pprint
|
||||
import test.test_support
|
||||
import unittest
|
||||
import test.test_set
|
||||
|
||||
try:
|
||||
uni = unicode
|
||||
|
|
@ -195,6 +196,197 @@ class QueryTestCase(unittest.TestCase):
|
|||
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))), 'set([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(),
|
||||
frozenset([0, 2]),
|
||||
frozenset([0, 1])]),
|
||||
frozenset([1]): frozenset([frozenset(),
|
||||
frozenset([1, 2]),
|
||||
frozenset([0, 1])]),
|
||||
frozenset([2]): frozenset([frozenset(),
|
||||
frozenset([1, 2]),
|
||||
frozenset([0, 2])]),
|
||||
frozenset([1, 2]): frozenset([frozenset([2]),
|
||||
frozenset([1]),
|
||||
frozenset([0, 1, 2])]),
|
||||
frozenset([0, 2]): frozenset([frozenset([2]),
|
||||
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, 2]),
|
||||
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])])])}"""
|
||||
|
||||
cubo = test.test_set.linegraph(cube)
|
||||
self.assertEqual(pprint.pformat(cubo), cubo_repr_tgt)
|
||||
|
||||
|
||||
class DottedPrettyPrinter(pprint.PrettyPrinter):
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue