Skip to content

Commit 9e8446a

Browse files
committed
Use PyObject_CallOneArg where applicable
1 parent 6a1560c commit 9e8446a

File tree

5 files changed

+11
-12
lines changed

5 files changed

+11
-12
lines changed

src_c/base.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2331,7 +2331,7 @@ MODINIT_DEFINE(base)
23312331
if (!quit) { /* assertion */
23322332
goto error;
23332333
}
2334-
rval = PyObject_CallFunctionObjArgs(atexit_register, quit, NULL);
2334+
rval = PyObject_CallOneArg(atexit_register, quit);
23352335
Py_DECREF(atexit_register);
23362336
Py_DECREF(quit);
23372337
atexit_register = NULL;

src_c/bufferproxy.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ _get_buffer_from_dict(PyObject *dict, Py_buffer *view_p, int flags)
107107
PyObject *py_rval;
108108

109109
Py_INCREF(py_callback);
110-
py_rval = PyObject_CallFunctionObjArgs(py_callback, obj, NULL);
110+
py_rval = PyObject_CallOneArg(py_callback, obj);
111111
Py_DECREF(py_callback);
112112
if (!py_rval) {
113113
pgBuffer_Release(pg_dict_view_p);
@@ -153,7 +153,7 @@ _release_buffer_from_dict(Py_buffer *view_p)
153153
PyObject *py_rval;
154154

155155
Py_INCREF(py_callback);
156-
py_rval = PyObject_CallFunctionObjArgs(py_callback, obj, NULL);
156+
py_rval = PyObject_CallOneArg(py_callback, obj);
157157
if (py_rval) {
158158
Py_DECREF(py_rval);
159159
}

src_c/key.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -188,8 +188,8 @@ key_get_pressed(PyObject *self, PyObject *_null)
188188
PyTuple_SET_ITEM(key_tuple, i, key_elem);
189189
}
190190

191-
ret_obj = PyObject_CallFunctionObjArgs((PyObject *)&pgScancodeWrapper_Type,
192-
key_tuple, NULL);
191+
ret_obj =
192+
PyObject_CallOneArg((PyObject *)&pgScancodeWrapper_Type, key_tuple);
193193
Py_DECREF(key_tuple);
194194
return ret_obj;
195195
}
@@ -216,8 +216,8 @@ get_just_pressed(PyObject *self, PyObject *_null)
216216
}
217217
PyTuple_SET_ITEM(key_tuple, i, key_elem);
218218
}
219-
ret_obj = PyObject_CallFunctionObjArgs((PyObject *)&pgScancodeWrapper_Type,
220-
key_tuple, NULL);
219+
ret_obj =
220+
PyObject_CallOneArg((PyObject *)&pgScancodeWrapper_Type, key_tuple);
221221
Py_DECREF(key_tuple);
222222
return ret_obj;
223223
}
@@ -244,8 +244,8 @@ get_just_released(PyObject *self, PyObject *_null)
244244
}
245245
PyTuple_SET_ITEM(key_tuple, i, key_elem);
246246
}
247-
ret_obj = PyObject_CallFunctionObjArgs((PyObject *)&pgScancodeWrapper_Type,
248-
key_tuple, NULL);
247+
ret_obj =
248+
PyObject_CallOneArg((PyObject *)&pgScancodeWrapper_Type, key_tuple);
249249
Py_DECREF(key_tuple);
250250
return ret_obj;
251251
}

src_c/rect_impl.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1525,8 +1525,7 @@ RectExport_RectFromObjectAndKeyFunc(PyObject *obj, PyObject *keyfunc,
15251525
InnerRect *temp)
15261526
{
15271527
if (keyfunc) {
1528-
PyObject *obj_with_rect =
1529-
PyObject_CallFunctionObjArgs(keyfunc, obj, NULL);
1528+
PyObject *obj_with_rect = PyObject_CallOneArg(keyfunc, obj);
15301529
if (!obj_with_rect) {
15311530
return NULL;
15321531
}

src_c/rwobject.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@ _pg_rw_size(SDL_RWops *context)
342342

343343
/* Return to original position.
344344
*/
345-
tmp = PyObject_CallFunctionObjArgs(helper->seek, pos, NULL);
345+
tmp = PyObject_CallOneArg(helper->seek, pos);
346346
if (!tmp) {
347347
PyErr_Print();
348348
goto end;

0 commit comments

Comments
 (0)