diff options
| author | Benjamin Peterson <benjamin@python.org> | 2016-03-04 06:10:52 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2016-03-04 06:10:52 (GMT) |
| commit | 0f04bc79592f2cea68fd7153b792910bf3527bf5 (patch) | |
| tree | 3506ccd7e9780c0461bbec42880a2dce6d24060c /Objects | |
| parent | 998f7d719b6ffccc3bb8955fc5b6870b3665146c (diff) | |
| parent | cfc2a1fc700e1f93a2e1d9a3de02bb936f868a42 (diff) | |
| download | cpython-0f04bc79592f2cea68fd7153b792910bf3527bf5.zip cpython-0f04bc79592f2cea68fd7153b792910bf3527bf5.tar.gz cpython-0f04bc79592f2cea68fd7153b792910bf3527bf5.tar.bz2 | |
merge 3.5 (closes #26478)
Diffstat (limited to 'Objects')
| -rw-r--r-- | Objects/dictobject.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/Objects/dictobject.c b/Objects/dictobject.c index 31a6322..0fa8241 100644 --- a/Objects/dictobject.c +++ b/Objects/dictobject.c @@ -3451,7 +3451,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; @@ -3471,7 +3471,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; @@ -3491,7 +3491,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; @@ -3511,8 +3511,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; |