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

task: Prevent error indicator being sporadically cleared

Browse Source
This commit is contained in:
rdb 2021-05-31 16:07:50 +02:00
parent e63eab9aa2
commit c9508f3215
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
panda/src/event/asyncFuture_ext.cxx
View File

@ -398,6 +398,10 @@ PyObject *Extension<AsyncFuture>::
get_cancelled_error_type() { get_cancelled_error_type() {
static PyObject *exc_type = nullptr; static PyObject *exc_type = nullptr;
if (exc_type == nullptr) { if (exc_type == nullptr) {
// This method should not affect the current exception, so stash it.
PyObject *curexc_type, *curexc_value, *curexc_traceback;
PyErr_Fetch(&curexc_type, &curexc_value, &curexc_traceback);
// Get the CancelledError that asyncio uses, too. // Get the CancelledError that asyncio uses, too.
#if PY_VERSION_HEX >= 0x03080000 #if PY_VERSION_HEX >= 0x03080000
PyObject *module = PyImport_ImportModule("asyncio.exceptions"); PyObject *module = PyImport_ImportModule("asyncio.exceptions");
@ -408,9 +412,6 @@ get_cancelled_error_type() {
exc_type = PyObject_GetAttrString(module, "CancelledError"); exc_type = PyObject_GetAttrString(module, "CancelledError");
Py_DECREF(module); Py_DECREF(module);
} }
else {
PyErr_Clear();
}
// If we can't get that, we should pretend and make our own. // If we can't get that, we should pretend and make our own.
if (exc_type == nullptr) { if (exc_type == nullptr) {
@ -424,6 +425,8 @@ get_cancelled_error_type() {
nullptr, nullptr); nullptr, nullptr);
#endif #endif
} }
PyErr_Restore(curexc_type, curexc_value, curexc_traceback);
} }
return exc_type; return exc_type;
} }