[Python-checkins] cpython (3.4): #24215: also back out changeset that broke test_trace in 3.4.
r.david.murray
python-checkins at python.org
Tue May 19 14:26:08 CEST 2015
https://hg.python.org/cpython/rev/cf52756f19b6
changeset: 96157:cf52756f19b6
branch: 3.4
parent: 96152:ea878f847eee
user: R David Murray <rdmurray at bitdance.com>
date: Tue May 19 08:24:59 2015 -0400
summary:
#24215: also back out changeset that broke test_trace in 3.4.
I missed that this change was applied to both branches.
files:
Lib/test/test_pprint.py | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/Lib/test/test_pprint.py b/Lib/test/test_pprint.py
--- a/Lib/test/test_pprint.py
+++ b/Lib/test/test_pprint.py
@@ -58,8 +58,7 @@
def test_basic(self):
# Verify .isrecursive() and .isreadable() w/o recursion
pp = pprint.PrettyPrinter()
- for safe in (2, 2.0, 2j, "abc", [3], (2,2), {3: 3}, b"def",
- bytearray(b"ghi"), True, False, None,
+ for safe in (2, 2.0, 2j, "abc", [3], (2,2), {3: 3}, "yaddayadda",
self.a, self.b):
# module-level convenience functions
self.assertFalse(pprint.isrecursive(safe),
@@ -129,23 +128,21 @@
# it sorted a dict display if and only if the display required
# multiple lines. For that reason, dicts with more than one element
# 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(),
[], list2(), list3(),
set(), set2(), set3(),
frozenset(), frozenset2(), frozenset3(),
{}, dict2(), dict3(),
self.assertTrue, pprint,
- -6, -6, -6-6j, -1.5, "x", b"x", bytearray(b"x"),
- (3,), [3], {3: 6},
+ -6, -6, -6-6j, -1.5, "x", b"x", (3,), [3], {3: 6},
(1,2), [3,4], {5: 6},
tuple2((1,2)), tuple3((1,2)), tuple3(range(100)),
[3,4], list2([3,4]), list3([3,4]), list3(range(100)),
set({7}), set2({7}), set3({7}),
frozenset({8}), frozenset2({8}), frozenset3({8}),
dict2({5: 6}), dict3({5: 6}),
- range(10, -11, -1),
- True, False, None,
+ range(10, -11, -1)
):
native = repr(simple)
self.assertEqual(pprint.pformat(simple), native)
@@ -600,5 +597,9 @@
self, object, context, maxlevels, level)
+def test_main():
+ test.support.run_unittest(QueryTestCase)
+
+
if __name__ == "__main__":
- unittest.main()
+ test_main()
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list