diff options
Diffstat (limited to 'Objects')
| -rw-r--r-- | Objects/classobject.c | 7 | ||||
| -rw-r--r-- | Objects/typeobject.c | 10 | ||||
| -rw-r--r-- | Objects/weakrefobject.c | 2 |
3 files changed, 8 insertions, 11 deletions
diff --git a/Objects/classobject.c b/Objects/classobject.c index a1907f5..a89366b 100644 --- a/Objects/classobject.c +++ b/Objects/classobject.c @@ -81,12 +81,9 @@ PyClass_New(PyObject *bases, PyObject *dict, PyObject *name) if (!PyClass_Check(base)) { if (PyCallable_Check( (PyObject *) base->ob_type)) - return PyObject_CallFunction( + return PyObject_CallFunctionObjArgs( (PyObject *) base->ob_type, - "OOO", - name, - bases, - dict); + name, bases, dict, NULL); PyErr_SetString(PyExc_TypeError, "PyClass_New: base must be a class"); return NULL; diff --git a/Objects/typeobject.c b/Objects/typeobject.c index 0905d19..0881ab1 100644 --- a/Objects/typeobject.c +++ b/Objects/typeobject.c @@ -4641,10 +4641,10 @@ slot_tp_getattr_hook(PyObject *self, PyObject *name) (void *)PyObject_GenericGetAttr)) res = PyObject_GenericGetAttr(self, name); else - res = PyObject_CallFunction(getattribute, "OO", self, name); + res = PyObject_CallFunctionObjArgs(getattribute, self, name, NULL); if (res == NULL && PyErr_ExceptionMatches(PyExc_AttributeError)) { PyErr_Clear(); - res = PyObject_CallFunction(getattr, "OO", self, name); + res = PyObject_CallFunctionObjArgs(getattr, self, name, NULL); } return res; } @@ -4781,7 +4781,7 @@ slot_tp_descr_get(PyObject *self, PyObject *obj, PyObject *type) obj = Py_None; if (type == NULL) type = Py_None; - return PyObject_CallFunction(get, "OOO", self, obj, type); + return PyObject_CallFunctionObjArgs(get, self, obj, type, NULL); } static int @@ -5728,8 +5728,8 @@ super_descr_get(PyObject *self, PyObject *obj, PyObject *type) if (su->ob_type != &PySuper_Type) /* If su is an instance of a (strict) subclass of super, call its type */ - return PyObject_CallFunction((PyObject *)su->ob_type, - "OO", su->type, obj); + return PyObject_CallFunctionObjArgs((PyObject *)su->ob_type, + su->type, obj, NULL); else { /* Inline the common case */ PyTypeObject *obj_type = supercheck(su->type, obj); diff --git a/Objects/weakrefobject.c b/Objects/weakrefobject.c index a8ab56e..bbeb3c0 100644 --- a/Objects/weakrefobject.c +++ b/Objects/weakrefobject.c @@ -851,7 +851,7 @@ PyWeakref_GetObject(PyObject *ref) static void handle_callback(PyWeakReference *ref, PyObject *callback) { - PyObject *cbresult = PyObject_CallFunction(callback, "O", ref); + PyObject *cbresult = PyObject_CallFunctionObjArgs(callback, ref, NULL); if (cbresult == NULL) PyErr_WriteUnraisable(callback); |