Skip to content
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

bpo-29548: Recommend PyObject_Call APIs over PyEval_Call APIs. #75

Merged
merged 1 commit into from
Mar 14, 2017
Merged

bpo-29548: Recommend PyObject_Call APIs over PyEval_Call APIs. #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions Include/ceval.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,12 @@ extern "C" {

/* Interface to random parts in ceval.c */

/* PyEval_CallObjectWithKeywords(), PyEval_CallObject(), PyEval_CallFunction
* and PyEval_CallMethod are kept for backward compatibility: PyObject_Call(),
* PyObject_CallFunction() and PyObject_CallMethod() are recommended to call
* a callable object.
*/

PyAPI_FUNC(PyObject *) PyEval_CallObjectWithKeywords(
PyObject *callable,
PyObject *args,
Expand Down
57 changes: 24 additions & 33 deletions Objects/call.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -939,25 +939,20 @@ PyObject_CallFunction(PyObject *callable, const char *format, ...)
}


/* PyEval_CallFunction is exact copy of PyObject_CallFunction.
* This function is kept for backward compatibility.
*/
PyObject *
PyEval_CallFunction(PyObject *callable, const char *format, ...)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

commit message: this change also optimizes PyEval_CallFunction() and PyEval_CallMethod() to avoid temporary tuple when possible.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Main purpose is reducing maintenance cost rather than optimization.
There are very few callers in the world.

I hope compiler can remove duplicated code too, but I'm not sure.

{
va_list vargs;
PyObject *args;
PyObject *res;

va_start(vargs, format);

args = Py_VaBuildValue(format, vargs);
va_end(vargs);

if (args == NULL)
return NULL;
va_list va;
PyObject *result;

res = PyEval_CallObject(callable, args);
Py_DECREF(args);
va_start(va, format);
result = _PyObject_CallFunctionVa(callable, format, va, 0);
va_end(va);

return res;
return result;
}


Expand Down Expand Up @@ -1014,33 +1009,29 @@ PyObject_CallMethod(PyObject *obj, const char *name, const char *format, ...)
}


/* PyEval_CallMethod is exact copy of PyObject_CallMethod.
* This function is kept for backward compatibility.
*/
PyObject *
PyEval_CallMethod(PyObject *obj, const char *name, const char *format, ...)
{
va_list vargs;
PyObject *meth;
PyObject *args;
PyObject *res;

meth = PyObject_GetAttrString(obj, name);
if (meth == NULL)
return NULL;

va_start(vargs, format);
va_list va;
PyObject *callable, *retval;

args = Py_VaBuildValue(format, vargs);
va_end(vargs);
if (obj == NULL || name == NULL) {
return null_error();
}

if (args == NULL) {
Py_DECREF(meth);
callable = PyObject_GetAttrString(obj, name);
if (callable == NULL)
return NULL;
}

res = PyEval_CallObject(meth, args);
Py_DECREF(meth);
Py_DECREF(args);
va_start(va, format);
retval = callmethod(callable, format, va, 0);
va_end(va);

return res;
Py_DECREF(callable);
return retval;
}


Expand Down