bpo-38202: Fix a crash in dict_view & non-itearble. (GH-16241)

This commit is contained in:
Zackery Spytz 2019-10-13 05:49:05 -06:00 committed by Serhiy Storchaka
parent 793cb85437
commit b16e382c44
2 changed files with 23 additions and 0 deletions

View File

@ -227,6 +227,25 @@ class DictSetTest(unittest.TestCase):
self.assertEqual(items | iter([(1, 2)]), {(1, 2), (3, 4)}) self.assertEqual(items | iter([(1, 2)]), {(1, 2), (3, 4)})
self.assertEqual(items - iter([(1, 2)]), {(3, 4)}) self.assertEqual(items - iter([(1, 2)]), {(3, 4)})
def test_set_operations_with_noniterable(self):
with self.assertRaises(TypeError):
{}.keys() & 1
with self.assertRaises(TypeError):
{}.keys() | 1
with self.assertRaises(TypeError):
{}.keys() ^ 1
with self.assertRaises(TypeError):
{}.keys() - 1
with self.assertRaises(TypeError):
{}.items() & 1
with self.assertRaises(TypeError):
{}.items() | 1
with self.assertRaises(TypeError):
{}.items() ^ 1
with self.assertRaises(TypeError):
{}.items() - 1
def test_recursive_repr(self): def test_recursive_repr(self):
d = {} d = {}
d[42] = d.values() d[42] = d.values()

View File

@ -4227,6 +4227,10 @@ _PyDictView_Intersect(PyObject* self, PyObject *other)
return NULL; return NULL;
it = PyObject_GetIter(other); it = PyObject_GetIter(other);
if (it == NULL) {
Py_DECREF(result);
return NULL;
}
if (PyDictKeys_Check(self)) { if (PyDictKeys_Check(self)) {
dict_contains = dictkeys_contains; dict_contains = dictkeys_contains;