diff options
| author | Benjamin Peterson <benjamin@python.org> | 2014-04-14 03:52:43 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2014-04-14 03:52:43 (GMT) |
| commit | a548a30fed74819c4b1411dde4f07944770b5df4 (patch) | |
| tree | acc7b4cb036775e3805e85883d593f0bf91dd028 /Python/ceval.c | |
| parent | 79f3ef63361b00e2e70a9d8edba6afa5096d3380 (diff) | |
| parent | f6e50b4a811477206d1c252a531c31029ea93866 (diff) | |
| download | cpython-a548a30fed74819c4b1411dde4f07944770b5df4.zip cpython-a548a30fed74819c4b1411dde4f07944770b5df4.tar.gz cpython-a548a30fed74819c4b1411dde4f07944770b5df4.tar.bz2 | |
merge 3.4 (#21209)
Diffstat (limited to 'Python/ceval.c')
| -rw-r--r-- | Python/ceval.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Python/ceval.c b/Python/ceval.c index ab7afa9..e14e772 100644 --- a/Python/ceval.c +++ b/Python/ceval.c @@ -1926,7 +1926,7 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag) if (v == Py_None) retval = Py_TYPE(reciever)->tp_iternext(reciever); else - retval = _PyObject_CallMethodId(reciever, &PyId_send, "O", v); + retval = _PyObject_CallMethodIdObjArgs(reciever, &PyId_send, v, NULL); } Py_DECREF(v); if (retval == NULL) { |