TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-29 08:15:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

event: Replace _PyGen_FetchStopIterationValue in Python 3.13+

Browse Source 
See python/cpython#106320 and python/cpython#107032

Closes #1526
This commit is contained in:
rdb 2023-08-05 16:37:01 +02:00
parent a463f25d39
commit 0bc290eb2c
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
panda/src/event/pythonTask.cxx
View File

@ -545,7 +545,17 @@ do_python_task() {
Py_DECREF(_generator); Py_DECREF(_generator);
_generator = nullptr; _generator = nullptr;
#if PY_VERSION_HEX >= 0x03030000 #if PY_VERSION_HEX >= 0x030D0000 // Python 3.13
// Python 3.13 does not support _PyGen_FetchStopIterationValue anymore.
if (PyErr_ExceptionMatches(PyExc_StopIteration)) {
PyObject *exc = PyErr_GetRaisedException();
result = ((PyStopIterationObject *)exc)->value;
if (result == nullptr) {
result = Py_None;
}
Py_INCREF(result);
Py_DECREF(exc);
#elif PY_VERSION_HEX >= 0x03030000
if (_PyGen_FetchStopIterationValue(&result) == 0) { if (_PyGen_FetchStopIterationValue(&result) == 0) {
#else #else
if (PyErr_ExceptionMatches(PyExc_StopIteration)) { if (PyErr_ExceptionMatches(PyExc_StopIteration)) {