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

task: Use TimeoutError from asyncio.exceptions on Python 3.8+

Browse Source 
Fixes unit test failures
This commit is contained in:
rdb 2020-05-05 14:35:43 +02:00
parent e2ec8ecbf0
commit 29f552a6ef
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -196,16 +196,26 @@ result(PyObject *timeout) const {
static PyObject *exc_type = nullptr; static PyObject *exc_type = nullptr;
if (exc_type == nullptr) { if (exc_type == nullptr) {
// Get the TimeoutError that asyncio uses, too. // Get the TimeoutError that asyncio uses, too.
#if PY_VERSION_HEX >= 0x03080000
PyObject *module = PyImport_ImportModule("asyncio.exceptions");
#else
PyObject *module = PyImport_ImportModule("concurrent.futures._base"); PyObject *module = PyImport_ImportModule("concurrent.futures._base");
#endif
if (module != nullptr) { if (module != nullptr) {
exc_type = PyObject_GetAttrString(module, "TimeoutError"); exc_type = PyObject_GetAttrString(module, "TimeoutError");
Py_DECREF(module); Py_DECREF(module);
} }
// 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) {
#if PY_VERSION_HEX >= 0x03080000
exc_type = PyErr_NewExceptionWithDoc((char*)"asyncio.exceptions.TimeoutError",
(char*)"The operation exceeded the given deadline.",
nullptr, nullptr);
#else
exc_type = PyErr_NewExceptionWithDoc((char*)"concurrent.futures._base.TimeoutError", exc_type = PyErr_NewExceptionWithDoc((char*)"concurrent.futures._base.TimeoutError",
(char*)"The operation exceeded the given deadline.", (char*)"The operation exceeded the given deadline.",
nullptr, nullptr); nullptr, nullptr);
#endif
} }
} }
PyErr_SetNone(exc_type); PyErr_SetNone(exc_type);