mirror of
https://github.com/python/cpython.git
synced 2025-07-24 11:44:31 +00:00
bpo-18533: Avoid RecursionError from repr() of recursive dictview (#4823)
dictview_repr(): Use a Py_ReprEnter() / Py_ReprLeave() pair to check for recursion, and produce "..." if so. test_recursive_repr(): Check for the string rather than a RecursionError. (Test cannot be any tighter as contents are implementation-dependent.) test_deeply_nested_repr(): Add new test, replacing the original test_recursive_repr(). It checks that a RecursionError is raised in the case of a non-recursive but deeply nested structure. (Very similar to what test_repr_deep() in test/test_dict.py does for a normal dict.) OrderedDictTests: Add new test case, to test behavior on OrderedDict instances containing their own values() or items().
This commit is contained in:
parent
e76daebc0c
commit
d7773d92bd
4 changed files with 44 additions and 4 deletions
|
@ -355,6 +355,20 @@ class OrderedDictTests:
|
|||
self.assertEqual(repr(od),
|
||||
"OrderedDict([('a', None), ('b', None), ('c', None), ('x', ...)])")
|
||||
|
||||
def test_repr_recursive_values(self):
|
||||
OrderedDict = self.OrderedDict
|
||||
od = OrderedDict()
|
||||
od[42] = od.values()
|
||||
r = repr(od)
|
||||
# Cannot perform a stronger test, as the contents of the repr
|
||||
# are implementation-dependent. All we can say is that we
|
||||
# want a str result, not an exception of any sort.
|
||||
self.assertIsInstance(r, str)
|
||||
od[42] = od.items()
|
||||
r = repr(od)
|
||||
# Again.
|
||||
self.assertIsInstance(r, str)
|
||||
|
||||
def test_setdefault(self):
|
||||
OrderedDict = self.OrderedDict
|
||||
pairs = [('c', 1), ('b', 2), ('a', 3), ('d', 4), ('e', 5), ('f', 6)]
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue