diff options
| author | Benjamin Peterson <benjamin@python.org> | 2016-03-04 06:08:01 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2016-03-04 06:08:01 (GMT) |
| commit | cfc2a1fc700e1f93a2e1d9a3de02bb936f868a42 (patch) | |
| tree | 34317302024fd957eca4cb5a7b759fca2a4208b3 /Objects/dictobject.c | |
| parent | ff47cfbc66b30e0714495cc74f92fa009bd8c1ca (diff) | |
| parent | f11b25b0813a1c07ddf55cca1512ef65eb97a636 (diff) | |
| download | cpython-cfc2a1fc700e1f93a2e1d9a3de02bb936f868a42.zip cpython-cfc2a1fc700e1f93a2e1d9a3de02bb936f868a42.tar.gz cpython-cfc2a1fc700e1f93a2e1d9a3de02bb936f868a42.tar.bz2 | |
merge 3.4 (closes #26478)
Diffstat (limited to 'Objects/dictobject.c')
| -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 8523511..e4dff98 100644 --- a/Objects/dictobject.c +++ b/Objects/dictobject.c @@ -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; |