Skip to content

bpo-29548: Fix some inefficient call API usage #97

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
methane merged 4 commits into from
Feb 16, 2017
Merged

bpo-29548: Fix some inefficient call API usage #97

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4e2f6b4
Fix some inefficient call API usage
methane Feb 14, 2017
4e7d7a4
minor style fix
methane Feb 15, 2017
706f9e3
revert functools changes
methane Feb 15, 2017
044f9fd
remove unused variable. fix inconsistency between arg format and argu…
methane Feb 15, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
revert functools changes
  • Loading branch information
@methane
methane committed Feb 15, 2017
commit 706f9e39b2ca4c8fa93f9ca7c6459cf142f973cf
26 changes: 19 additions & 7 deletions Modules/_functoolsmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -560,26 +560,37 @@ functools_reduce(PyObject *self, PyObject *args)
return NULL;
}

if ((args = PyTuple_New(2)) == NULL)
goto Fail;

for (;;) {
PyObject *op2 = PyIter_Next(it);
PyObject *op2;

if (args->ob_refcnt > 1) {
Py_DECREF(args);
if ((args = PyTuple_New(2)) == NULL)
goto Fail;
}

op2 = PyIter_Next(it);
if (op2 == NULL) {
if (PyErr_Occurred())
goto Fail;
break;
}

if (result == NULL) {
if (result == NULL)
result = op2;
}
else {
PyObject *args[] = {result, op2};
result = _PyObject_FastCall(func, args, 2);
if (result == NULL) {
PyTuple_SetItem(args, 0, result);
PyTuple_SetItem(args, 1, op2);
if ((result = PyEval_CallObject(func, args)) == NULL)
goto Fail;
}
}
}

Py_DECREF(args);

if (result == NULL)
PyErr_SetString(PyExc_TypeError,
"reduce() of empty sequence with no initial value");
Expand All @@ -588,6 +599,7 @@ functools_reduce(PyObject *self, PyObject *args)
return result;

Fail:
Py_XDECREF(args);
Py_XDECREF(result);
Py_DECREF(it);
return NULL;
Expand Down