From d7773d92bd11640a8c950d6c36a9cef1cee36f96 Mon Sep 17 00:00:00 2001 From: bennorth Date: Fri, 26 Jan 2018 15:46:01 +0000 Subject: 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(). --- Lib/test/test_dictviews.py | 15 +++++++++++++++ Lib/test/test_ordered_dict.py | 14 ++++++++++++++ 2 files changed, 29 insertions(+) (limited to 'Lib/test') diff --git a/Lib/test/test_dictviews.py b/Lib/test/test_dictviews.py index 51ad9b381c..2763cbfb4b 100644 --- a/Lib/test/test_dictviews.py +++ b/Lib/test/test_dictviews.py @@ -1,6 +1,7 @@ import collections.abc import copy import pickle +import sys import unittest class DictSetTest(unittest.TestCase): @@ -202,6 +203,20 @@ class DictSetTest(unittest.TestCase): def test_recursive_repr(self): d = {} d[42] = d.values() + r = repr(d) + # 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) + d[42] = d.items() + r = repr(d) + # Again. + self.assertIsInstance(r, str) + + def test_deeply_nested_repr(self): + d = {} + for i in range(sys.getrecursionlimit() + 100): + d = {42: d.values()} self.assertRaises(RecursionError, repr, d) def test_copy(self): diff --git a/Lib/test/test_ordered_dict.py b/Lib/test/test_ordered_dict.py index 6bafb8be30..20efe3729d 100644 --- a/Lib/test/test_ordered_dict.py +++ b/Lib/test/test_ordered_dict.py @@ -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)] -- cgit v1.2.1