mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 00:48:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

merge 3.4 (closes #26478)

Browse source
This commit is contained in:
Benjamin Peterson 2016-03-03 22:08:01 -08:00
commit cfc2a1fc70
3 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Lib/test/test_dictviews.py
View file

@ -96,6 +96,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'})
@ -104,6 +105,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'})
@ -112,6 +114,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'})
@ -119,6 +122,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()))

3
Misc/NEWS
View file

@ -76,6 +76,9 @@ Core and Builtins
__bytes__, __trunc__, and __float__ returning instances of subclasses of
bytes, int, and float to subclasses of bytes, int, and float correspondingly.
- 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().

9
Objects/dictobject.c
View file

@ -3448,7 +3448,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;
@ -3468,7 +3468,7 @@ _PyDictView_Intersect(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;
@ -3488,7 +3488,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;
@ -3508,8 +3508,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;