traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

#24215: also back out changeset that broke test_trace in 3.4. 

I missed that this change was applied to both branches.
This commit is contained in:
R David Murray 2015-05-19 08:24:59 -04:00
parent ae760c0a2c
commit 6371446036
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Lib/test/test_pprint.py
View File

@ -58,8 +58,7 @@ class QueryTestCase(unittest.TestCase):
def test_basic(self): def test_basic(self):
# Verify .isrecursive() and .isreadable() w/o recursion # Verify .isrecursive() and .isreadable() w/o recursion
pp = pprint.PrettyPrinter() pp = pprint.PrettyPrinter()
for safe in (2, 2.0, 2j, "abc", [3], (2,2), {3: 3}, b"def", for safe in (2, 2.0, 2j, "abc", [3], (2,2), {3: 3}, "yaddayadda",
bytearray(b"ghi"), True, False, None,
self.a, self.b): self.a, self.b):
# module-level convenience functions # module-level convenience functions
self.assertFalse(pprint.isrecursive(safe), self.assertFalse(pprint.isrecursive(safe),
@ -129,23 +128,21 @@ class QueryTestCase(unittest.TestCase):
# it sorted a dict display if and only if the display required # it sorted a dict display if and only if the display required
# multiple lines. For that reason, dicts with more than one element # multiple lines. For that reason, dicts with more than one element
# aren't tested here. # aren't tested here.
for simple in (0, 0, 0+0j, 0.0, "", b"", bytearray(), for simple in (0, 0, 0+0j, 0.0, "", b"",
(), tuple2(), tuple3(), (), tuple2(), tuple3(),
[], list2(), list3(), [], list2(), list3(),
set(), set2(), set3(), set(), set2(), set3(),
frozenset(), frozenset2(), frozenset3(), frozenset(), frozenset2(), frozenset3(),
{}, dict2(), dict3(), {}, dict2(), dict3(),
self.assertTrue, pprint, self.assertTrue, pprint,
-6, -6, -6-6j, -1.5, "x", b"x", bytearray(b"x"), -6, -6, -6-6j, -1.5, "x", b"x", (3,), [3], {3: 6},
(3,), [3], {3: 6},
(1,2), [3,4], {5: 6}, (1,2), [3,4], {5: 6},
tuple2((1,2)), tuple3((1,2)), tuple3(range(100)), tuple2((1,2)), tuple3((1,2)), tuple3(range(100)),
[3,4], list2([3,4]), list3([3,4]), list3(range(100)), [3,4], list2([3,4]), list3([3,4]), list3(range(100)),
set({7}), set2({7}), set3({7}), set({7}), set2({7}), set3({7}),
frozenset({8}), frozenset2({8}), frozenset3({8}), frozenset({8}), frozenset2({8}), frozenset3({8}),
dict2({5: 6}), dict3({5: 6}), dict2({5: 6}), dict3({5: 6}),
range(10, -11, -1), range(10, -11, -1)
True, False, None,
): ):
native = repr(simple) native = repr(simple)
self.assertEqual(pprint.pformat(simple), native) self.assertEqual(pprint.pformat(simple), native)
@ -600,5 +597,9 @@ class DottedPrettyPrinter(pprint.PrettyPrinter):
self, object, context, maxlevels, level) self, object, context, maxlevels, level)
def test_main():
test.support.run_unittest(QueryTestCase)
if __name__ == "__main__": if __name__ == "__main__":
unittest.main() test_main()