Skip to content

Commit 77d8abd

Browse files
committed
do not use PyObject_CallOneArg (not avali on python 3.8
1 parent 87ec564 commit 77d8abd

File tree

1 file changed

+17
-6
lines changed

1 file changed

+17
-6
lines changed

src/bzfs/bzfsPython.cxx

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -874,7 +874,9 @@ static PyObject *genEvent (bz_GetPlayerSpawnPosEventData_V1 &spawnData)
874874
if (result < 0)
875875
return nullptr;
876876

877-
return PyObject_CallOneArg(getPlayerSpawnPosEventData_V1, tankCoordinate);
877+
return PyObject_CallFunctionObjArgs(getPlayerSpawnPosEventData_V1,
878+
tankCoordinate,
879+
NULL);
878880
}
879881

880882
static void treatEvent (
@@ -924,7 +926,10 @@ static PyObject *genEvent (bz_FlagTransferredEventData_V1 &data)
924926
if (!pArg)
925927
return nullptr;
926928

927-
PyObject *pEvent = PyObject_CallOneArg(flagTransferredEventData_V1, pArg);
929+
PyObject *pEvent = PyObject_CallFunctionObjArgs(
930+
flagTransferredEventData_V1,
931+
pArg,
932+
NULL);
928933
Py_DECREF(pArg);
929934
return pEvent;
930935
}
@@ -935,7 +940,9 @@ static PyObject *genEvent (bz_FlagGrabbedEventData_V1 &data)
935940
if (!pArg)
936941
return nullptr;
937942

938-
PyObject *pEvent = PyObject_CallOneArg(flagGrabbedEventData_V1, pArg);
943+
PyObject *pEvent = PyObject_CallFunctionObjArgs(flagGrabbedEventData_V1,
944+
pArg,
945+
NULL);
939946
Py_DECREF(pArg);
940947
return pEvent;
941948
}
@@ -946,7 +953,9 @@ static PyObject *genEvent (bz_FlagDroppedEventData_V1 &data)
946953
if (!pArg)
947954
return nullptr;
948955

949-
PyObject *pEvent = PyObject_CallOneArg(flagDroppedEventData_V1, pArg);
956+
PyObject *pEvent = PyObject_CallFunctionObjArgs(flagDroppedEventData_V1,
957+
pArg,
958+
NULL);
950959
Py_DECREF(pArg);
951960
return pEvent;
952961
}
@@ -957,7 +966,9 @@ static PyObject *genEvent (bz_ShotFiredEventData_V1 &data)
957966
if (!pArg)
958967
return nullptr;
959968

960-
PyObject *pEvent = PyObject_CallOneArg(shotFiredEventData_V1, pArg);
969+
PyObject *pEvent = PyObject_CallFunctionObjArgs(shotFiredEventData_V1,
970+
pArg,
971+
NULL);
961972
Py_DECREF(pArg);
962973
return pEvent;
963974
}
@@ -1094,7 +1105,7 @@ void bzPythonEvent(bz_EventData *eventData)
10941105
return;
10951106
}
10961107

1097-
PyObject *pValue = PyObject_CallOneArg(callEvents, pEvent);
1108+
PyObject *pValue = PyObject_CallFunctionObjArgs(callEvents, pEvent, NULL);
10981109
Py_DECREF(pEvent);
10991110
if (!pValue)
11001111
PyErr_Print();

0 commit comments

Comments
 (0)