mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-03 19:34:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Cleanup callmethod()

Browse source 
Make callmethod() less weird: don't decrement func reference counter,
the caller is now responsible to do that.

Issue #27128.
This commit is contained in:
Victor Stinner 2016-08-19 16:56:49 +02:00
parent 64faad6e45
commit d042f1f5eb
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Objects/abstract.c
View file

@ -2343,9 +2343,10 @@ callmethod(PyObject* func, const char *format, va_list va, int is_size_t)
{ {
PyObject *args, *result; PyObject *args, *result;
assert(func != NULL);
if (!PyCallable_Check(func)) { if (!PyCallable_Check(func)) {
type_error("attribute of type '%.200s' is not callable", func); type_error("attribute of type '%.200s' is not callable", func);
Py_XDECREF(func);
return NULL; return NULL;
} }
@ -2363,7 +2364,6 @@ callmethod(PyObject* func, const char *format, va_list va, int is_size_t)
} }
result = call_function_tail(func, args); result = call_function_tail(func, args);
Py_XDECREF(func);
Py_DECREF(args); Py_DECREF(args);
return result; return result;
} }
@ -2385,6 +2385,7 @@ PyObject_CallMethod(PyObject *o, const char *name, const char *format, ...)
va_start(va, format); va_start(va, format);
retval = callmethod(func, format, va, 0); retval = callmethod(func, format, va, 0);
va_end(va); va_end(va);
Py_DECREF(func);
return retval; return retval;
} }
@ -2406,6 +2407,7 @@ _PyObject_CallMethodId(PyObject *o, _Py_Identifier *name,
va_start(va, format); va_start(va, format);
retval = callmethod(func, format, va, 0); retval = callmethod(func, format, va, 0);
va_end(va); va_end(va);
Py_DECREF(func);
return retval; return retval;
} }
@ -2426,6 +2428,7 @@ _PyObject_CallMethod_SizeT(PyObject *o, const char *name,
va_start(va, format); va_start(va, format);
retval = callmethod(func, format, va, 1); retval = callmethod(func, format, va, 1);
va_end(va); va_end(va);
Py_DECREF(func);
return retval; return retval;
} }
@ -2447,6 +2450,7 @@ _PyObject_CallMethodId_SizeT(PyObject *o, _Py_Identifier *name,
va_start(va, format); va_start(va, format);
retval = callmethod(func, format, va, 1); retval = callmethod(func, format, va, 1);
va_end(va); va_end(va);
Py_DECREF(func);
return retval; return retval;
} }