mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-31 14:07:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

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

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;