mirror of
https://github.com/python/cpython.git
synced 2025-10-25 10:44:55 +00:00
969fe57baa
svn+ssh://pythondev@svn.python.org/python/trunk ........ r60246 | guido.van.rossum | 2008-01-24 18:58:05 +0100 (Thu, 24 Jan 2008) | 2 lines Fix test67.py from issue #1303614. ........ r60248 | raymond.hettinger | 2008-01-24 19:05:54 +0100 (Thu, 24 Jan 2008) | 1 line Clean-up and speed-up code by accessing numerator/denominator directly. There's no reason to enforce readonliness ........ r60249 | raymond.hettinger | 2008-01-24 19:12:23 +0100 (Thu, 24 Jan 2008) | 1 line Revert 60189 and restore performance. ........ r60250 | guido.van.rossum | 2008-01-24 19:21:02 +0100 (Thu, 24 Jan 2008) | 5 lines News about recently fixed crashers: - A few crashers fixed: weakref_in_del.py (issue #1377858); loosing_dict_ref.py (issue #1303614, test67.py); borrowed_ref_[34].py (not in tracker). ........ r60252 | thomas.heller | 2008-01-24 19:36:27 +0100 (Thu, 24 Jan 2008) | 7 lines Use a PyDictObject again for the array type cache; retrieving items from the WeakValueDictionary was slower by nearly a factor of 3. To avoid leaks, weakref proxies for the array types are put into the cache dict, with weakref callbacks that removes the entries when the type goes away. ........ r60253 | thomas.heller | 2008-01-24 19:54:12 +0100 (Thu, 24 Jan 2008) | 2 lines Replace Py_BuildValue with PyTuple_Pack because it is faster. Also add a missing DECREF. ........ r60254 | raymond.hettinger | 2008-01-24 20:05:29 +0100 (Thu, 24 Jan 2008) | 1 line Add support for trunc(). ........ r60255 | thomas.heller | 2008-01-24 20:15:02 +0100 (Thu, 24 Jan 2008) | 5 lines Invert the checks in get_[u]long and get_[u]longlong. The intent was to not accept float types; the result was that integer-like objects were not accepted. Ported from release25-maint. ........ r60256 | raymond.hettinger | 2008-01-24 20:30:19 +0100 (Thu, 24 Jan 2008) | 1 line Add support for int(r) just like the other numeric classes. ........ r60263 | raymond.hettinger | 2008-01-24 22:23:58 +0100 (Thu, 24 Jan 2008) | 1 line Expand tests to include nested graph structures. ........ r60264 | raymond.hettinger | 2008-01-24 22:47:56 +0100 (Thu, 24 Jan 2008) | 1 line Shorter pprint's for empty sets and frozensets. Fix indentation of frozensets. Add tests including two complex data structures. ........ r60265 | amaury.forgeotdarc | 2008-01-24 23:51:18 +0100 (Thu, 24 Jan 2008) | 14 lines #1920: when considering a block starting by "while 0", the compiler optimized the whole construct away, even when an 'else' clause is present:: while 0: print("no") else: print("yes") did not generate any code at all. Now the compiler emits the 'else' block, like it already does for 'if' statements. Will backport. ........ r60266 | amaury.forgeotdarc | 2008-01-24 23:59:25 +0100 (Thu, 24 Jan 2008) | 2 lines News entry for r60265 (Issue 1920). ........ r60269 | raymond.hettinger | 2008-01-25 00:50:26 +0100 (Fri, 25 Jan 2008) | 1 line More code cleanup. Remove unnecessary indirection to useless class methods. ........ r60270 | raymond.hettinger | 2008-01-25 01:21:54 +0100 (Fri, 25 Jan 2008) | 1 line Add support for copy, deepcopy, and pickle. ........ r60271 | raymond.hettinger | 2008-01-25 01:33:45 +0100 (Fri, 25 Jan 2008) | 1 line Mark todos and review comments. ........ r60272 | raymond.hettinger | 2008-01-25 02:13:12 +0100 (Fri, 25 Jan 2008) | 1 line Add one other review comment. ........ r60273 | raymond.hettinger | 2008-01-25 02:23:38 +0100 (Fri, 25 Jan 2008) | 1 line Fix-up signature for approximation. ........ r60274 | raymond.hettinger | 2008-01-25 02:46:33 +0100 (Fri, 25 Jan 2008) | 1 line More design notes ........ r60276 | neal.norwitz | 2008-01-25 07:37:23 +0100 (Fri, 25 Jan 2008) | 6 lines Make the test more robust by trying to reconnect up to 3 times in case there were transient failures. This will hopefully silence the buildbots for this test. As we find other tests that have a problem, we can fix with a similar strategy assuming it is successful. It worked on my box in a loop for 10+ runs where it would have an exception otherwise. ........ r60277 | neal.norwitz | 2008-01-25 09:04:16 +0100 (Fri, 25 Jan 2008) | 4 lines Add prototypes to get the mathmodule.c to compile on OSF1 5.1 (Tru64) and eliminate a compiler warning in floatobject.c. There might be a better way to go about this, but it should be good enough for now. ........
403 lines
23 KiB
Python
403 lines
23 KiB
Python
import pprint
|
|
import test.test_support
|
|
import unittest
|
|
import test.test_set
|
|
|
|
# list, tuple and dict subclasses that do or don't overwrite __repr__
|
|
class list2(list):
|
|
pass
|
|
|
|
class list3(list):
|
|
def __repr__(self):
|
|
return list.__repr__(self)
|
|
|
|
class tuple2(tuple):
|
|
pass
|
|
|
|
class tuple3(tuple):
|
|
def __repr__(self):
|
|
return tuple.__repr__(self)
|
|
|
|
class dict2(dict):
|
|
pass
|
|
|
|
class dict3(dict):
|
|
def __repr__(self):
|
|
return dict.__repr__(self)
|
|
|
|
class QueryTestCase(unittest.TestCase):
|
|
|
|
def setUp(self):
|
|
self.a = list(range(100))
|
|
self.b = list(range(200))
|
|
self.a[-12] = self.b
|
|
|
|
def test_basic(self):
|
|
# Verify .isrecursive() and .isreadable() w/o recursion
|
|
verify = self.assert_
|
|
pp = pprint.PrettyPrinter()
|
|
for safe in (2, 2.0, 2j, "abc", [3], (2,2), {3: 3}, "yaddayadda",
|
|
self.a, self.b):
|
|
# module-level convenience functions
|
|
verify(not pprint.isrecursive(safe),
|
|
"expected not isrecursive for %r" % (safe,))
|
|
verify(pprint.isreadable(safe),
|
|
"expected isreadable for %r" % (safe,))
|
|
# PrettyPrinter methods
|
|
verify(not pp.isrecursive(safe),
|
|
"expected not isrecursive for %r" % (safe,))
|
|
verify(pp.isreadable(safe),
|
|
"expected isreadable for %r" % (safe,))
|
|
|
|
def test_knotted(self):
|
|
# Verify .isrecursive() and .isreadable() w/ recursion
|
|
# Tie a knot.
|
|
self.b[67] = self.a
|
|
# Messy dict.
|
|
self.d = {}
|
|
self.d[0] = self.d[1] = self.d[2] = self.d
|
|
|
|
verify = self.assert_
|
|
pp = pprint.PrettyPrinter()
|
|
|
|
for icky in self.a, self.b, self.d, (self.d, self.d):
|
|
verify(pprint.isrecursive(icky), "expected isrecursive")
|
|
verify(not pprint.isreadable(icky), "expected not isreadable")
|
|
verify(pp.isrecursive(icky), "expected isrecursive")
|
|
verify(not pp.isreadable(icky), "expected not isreadable")
|
|
|
|
# Break the cycles.
|
|
self.d.clear()
|
|
del self.a[:]
|
|
del self.b[:]
|
|
|
|
for safe in self.a, self.b, self.d, (self.d, self.d):
|
|
# module-level convenience functions
|
|
verify(not pprint.isrecursive(safe),
|
|
"expected not isrecursive for %r" % (safe,))
|
|
verify(pprint.isreadable(safe),
|
|
"expected isreadable for %r" % (safe,))
|
|
# PrettyPrinter methods
|
|
verify(not pp.isrecursive(safe),
|
|
"expected not isrecursive for %r" % (safe,))
|
|
verify(pp.isreadable(safe),
|
|
"expected isreadable for %r" % (safe,))
|
|
|
|
def test_unreadable(self):
|
|
# Not recursive but not readable anyway
|
|
verify = self.assert_
|
|
pp = pprint.PrettyPrinter()
|
|
for unreadable in type(3), pprint, pprint.isrecursive:
|
|
# module-level convenience functions
|
|
verify(not pprint.isrecursive(unreadable),
|
|
"expected not isrecursive for %r" % (unreadable,))
|
|
verify(not pprint.isreadable(unreadable),
|
|
"expected not isreadable for %r" % (unreadable,))
|
|
# PrettyPrinter methods
|
|
verify(not pp.isrecursive(unreadable),
|
|
"expected not isrecursive for %r" % (unreadable,))
|
|
verify(not pp.isreadable(unreadable),
|
|
"expected not isreadable for %r" % (unreadable,))
|
|
|
|
def test_same_as_repr(self):
|
|
# Simple objects, small containers and classes that overwrite __repr__
|
|
# For those the result should be the same as repr().
|
|
# Ahem. The docs don't say anything about that -- this appears to
|
|
# be testing an implementation quirk. Starting in Python 2.5, it's
|
|
# not true for dicts: pprint always sorts dicts by key now; before,
|
|
# 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.
|
|
verify = self.assert_
|
|
for simple in (0, 0, 0+0j, 0.0, "", b"",
|
|
(), tuple2(), tuple3(),
|
|
[], list2(), list3(),
|
|
{}, dict2(), dict3(),
|
|
verify, pprint,
|
|
-6, -6, -6-6j, -1.5, "x", b"x", (3,), [3], {3: 6},
|
|
(1,2), [3,4], {5: 6, 7: 8},
|
|
tuple2((1,2)), tuple3((1,2)), tuple3(range(100)),
|
|
[3,4], list2([3,4]), list3([3,4]), list3(range(100)),
|
|
{5: 6, 7: 8}, dict2({5: 6}), dict3({5: 6}),
|
|
range(10, -11, -1)
|
|
):
|
|
native = repr(simple)
|
|
for function in "pformat", "saferepr":
|
|
f = getattr(pprint, function)
|
|
got = f(simple)
|
|
verify(native == got, "expected %s got %s from pprint.%s" %
|
|
(native, got, function))
|
|
|
|
def test_basic_line_wrap(self):
|
|
# verify basic line-wrapping operation
|
|
o = {'RPM_cal': 0,
|
|
'RPM_cal2': 48059,
|
|
'Speed_cal': 0,
|
|
'controldesk_runtime_us': 0,
|
|
'main_code_runtime_us': 0,
|
|
'read_io_runtime_us': 0,
|
|
'write_io_runtime_us': 43690}
|
|
exp = """\
|
|
{'RPM_cal': 0,
|
|
'RPM_cal2': 48059,
|
|
'Speed_cal': 0,
|
|
'controldesk_runtime_us': 0,
|
|
'main_code_runtime_us': 0,
|
|
'read_io_runtime_us': 0,
|
|
'write_io_runtime_us': 43690}"""
|
|
for type in [dict, dict2]:
|
|
self.assertEqual(pprint.pformat(type(o)), exp)
|
|
|
|
o = range(100)
|
|
exp = '[%s]' % ',\n '.join(map(str, o))
|
|
for type in [list, list2]:
|
|
self.assertEqual(pprint.pformat(type(o)), exp)
|
|
|
|
o = tuple(range(100))
|
|
exp = '(%s)' % ',\n '.join(map(str, o))
|
|
for type in [tuple, tuple2]:
|
|
self.assertEqual(pprint.pformat(type(o)), exp)
|
|
|
|
# indent parameter
|
|
o = range(100)
|
|
exp = '[ %s]' % ',\n '.join(map(str, o))
|
|
for type in [list, list2]:
|
|
self.assertEqual(pprint.pformat(type(o), indent=4), exp)
|
|
|
|
def test_sorted_dict(self):
|
|
# Starting in Python 2.5, pprint sorts dict displays by key regardless
|
|
# of how small the dictionary may be.
|
|
# Before the change, on 32-bit Windows pformat() gave order
|
|
# 'a', 'c', 'b' here, so this test failed.
|
|
d = {'a': 1, 'b': 1, 'c': 1}
|
|
self.assertEqual(pprint.pformat(d), "{'a': 1, 'b': 1, 'c': 1}")
|
|
self.assertEqual(pprint.pformat([d, d]),
|
|
"[{'a': 1, 'b': 1, 'c': 1}, {'a': 1, 'b': 1, 'c': 1}]")
|
|
|
|
# The next one is kind of goofy. The sorted order depends on the
|
|
# alphabetic order of type names: "int" < "str" < "tuple". Before
|
|
# Python 2.5, this was in the test_same_as_repr() test. It's worth
|
|
# keeping around for now because it's one of few tests of pprint
|
|
# against a crazy mix of types.
|
|
self.assertEqual(pprint.pformat({"xy\tab\n": (3,), 5: [[]], (): {}}),
|
|
r"{5: [[]], 'xy\tab\n': (3,), (): {}}")
|
|
|
|
def test_subclassing(self):
|
|
o = {'names with spaces': 'should be presented using repr()',
|
|
'others.should.not.be': 'like.this'}
|
|
exp = """\
|
|
{'names with spaces': 'should be presented using repr()',
|
|
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))), '{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):
|
|
|
|
def format(self, object, context, maxlevels, level):
|
|
if isinstance(object, str):
|
|
if ' ' in object:
|
|
return repr(object), 1, 0
|
|
else:
|
|
return object, 0, 0
|
|
else:
|
|
return pprint.PrettyPrinter.format(
|
|
self, object, context, maxlevels, level)
|
|
|
|
|
|
def test_main():
|
|
test.test_support.run_unittest(QueryTestCase)
|
|
|
|
|
|
if __name__ == "__main__":
|
|
test_main()
|