diff options
| author | Benjamin Peterson <benjamin@python.org> | 2016-03-03 22:05:36 -0800 |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2016-03-03 22:05:36 -0800 |
| commit | f11b25b0813a1c07ddf55cca1512ef65eb97a636 (patch) | |
| tree | 545c770c505f61b94535e35acc7a85f61ae31932 | |
| parent | 25c0ef518d0e9267c4d31284a3ad93d4559d84c6 (diff) | |
| download | cpython-git-f11b25b0813a1c07ddf55cca1512ef65eb97a636.tar.gz | |
properly use the ObjArgs variant of CallMethod in dictview binary operations (closes #26478)
| -rw-r--r-- | Lib/test/test_dictviews.py | 4 | ||||
| -rw-r--r-- | Misc/NEWS | 3 | ||||
| -rw-r--r-- | Objects/dictobject.c | 9 |
3 files changed, 11 insertions, 5 deletions
diff --git a/Lib/test/test_dictviews.py b/Lib/test/test_dictviews.py index c7714cf790..5f2144a029 100644 --- a/Lib/test/test_dictviews.py +++ b/Lib/test/test_dictviews.py @@ -97,6 +97,7 @@ class DictSetTest(unittest.TestCase): self.assertEqual(d1.keys() & set(d1.keys()), {'a', 'b'}) self.assertEqual(d1.keys() & set(d2.keys()), {'b'}) self.assertEqual(d1.keys() & set(d3.keys()), set()) + self.assertEqual(d1.keys() & tuple(d1.keys()), {'a', 'b'}) self.assertEqual(d1.keys() | d1.keys(), {'a', 'b'}) self.assertEqual(d1.keys() | d2.keys(), {'a', 'b', 'c'}) @@ -105,6 +106,7 @@ class DictSetTest(unittest.TestCase): self.assertEqual(d1.keys() | set(d2.keys()), {'a', 'b', 'c'}) self.assertEqual(d1.keys() | set(d3.keys()), {'a', 'b', 'd', 'e'}) + self.assertEqual(d1.keys() | (1, 2), {'a', 'b', 1, 2}) self.assertEqual(d1.keys() ^ d1.keys(), set()) self.assertEqual(d1.keys() ^ d2.keys(), {'a', 'c'}) @@ -113,6 +115,7 @@ class DictSetTest(unittest.TestCase): self.assertEqual(d1.keys() ^ set(d2.keys()), {'a', 'c'}) self.assertEqual(d1.keys() ^ set(d3.keys()), {'a', 'b', 'd', 'e'}) + self.assertEqual(d1.keys() ^ tuple(d2.keys()), {'a', 'c'}) self.assertEqual(d1.keys() - d1.keys(), set()) self.assertEqual(d1.keys() - d2.keys(), {'a'}) @@ -120,6 +123,7 @@ class DictSetTest(unittest.TestCase): self.assertEqual(d1.keys() - set(d1.keys()), set()) self.assertEqual(d1.keys() - set(d2.keys()), {'a'}) self.assertEqual(d1.keys() - set(d3.keys()), {'a', 'b'}) + self.assertEqual(d1.keys() - (0, 1), {'a', 'b'}) self.assertFalse(d1.keys().isdisjoint(d1.keys())) self.assertFalse(d1.keys().isdisjoint(d2.keys())) @@ -10,6 +10,9 @@ Release date: tba Core and Builtins ----------------- +- Issue #26478: Fix semantic bugs when using binary operators with dictionary + views and tuples. + - Issue #26171: Fix possible integer overflow and heap corruption in zipimporter.get_data(). diff --git a/Objects/dictobject.c b/Objects/dictobject.c index a494d6b942..25619c116b 100644 --- a/Objects/dictobject.c +++ b/Objects/dictobject.c @@ -3394,7 +3394,7 @@ dictviews_sub(PyObject* self, PyObject *other) if (result == NULL) return NULL; - tmp = _PyObject_CallMethodId(result, &PyId_difference_update, "O", other); + tmp = _PyObject_CallMethodIdObjArgs(result, &PyId_difference_update, other, NULL); if (tmp == NULL) { Py_DECREF(result); return NULL; @@ -3414,7 +3414,7 @@ dictviews_and(PyObject* self, PyObject *other) if (result == NULL) return NULL; - tmp = _PyObject_CallMethodId(result, &PyId_intersection_update, "O", other); + tmp = _PyObject_CallMethodIdObjArgs(result, &PyId_intersection_update, other, NULL); if (tmp == NULL) { Py_DECREF(result); return NULL; @@ -3434,7 +3434,7 @@ dictviews_or(PyObject* self, PyObject *other) if (result == NULL) return NULL; - tmp = _PyObject_CallMethodId(result, &PyId_update, "O", other); + tmp = _PyObject_CallMethodIdObjArgs(result, &PyId_update, other, NULL); if (tmp == NULL) { Py_DECREF(result); return NULL; @@ -3454,8 +3454,7 @@ dictviews_xor(PyObject* self, PyObject *other) if (result == NULL) return NULL; - tmp = _PyObject_CallMethodId(result, &PyId_symmetric_difference_update, "O", - other); + tmp = _PyObject_CallMethodIdObjArgs(result, &PyId_symmetric_difference_update, other, NULL); if (tmp == NULL) { Py_DECREF(result); return NULL; |