TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-28 07:48:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

pstats: Fix exception when __module__ is a descriptor

Browse Source 
This comes up when using metaclasses

Fixes #1505
This commit is contained in:
rdb 2023-06-12 09:54:25 +02:00
parent d4d4aefbce
commit 94ebd7c953
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
panda/src/pstatclient/pStatClient_ext.cxx
View File

@ -181,10 +181,23 @@ make_c_function_collector(PyCFunctionObject *meth) {
} else {
// If there's no module name, we need to get it from __module__.
PyObject *py_mod_name = cls->tp_dict ? PyDict_GetItemString(cls->tp_dict, "__module__") : nullptr;
const char *mod_name;
const char *mod_name = nullptr;
if (py_mod_name != nullptr) {
mod_name = PyUnicode_AsUTF8(py_mod_name);
} else {
if (PyUnicode_Check(py_mod_name)) {
mod_name = PyUnicode_AsUTF8(py_mod_name);
} else {
// Might be a descriptor.
py_mod_name = PyObject_GetAttrString(meth->m_self, "__module__");
if (py_mod_name != nullptr) {
if (PyUnicode_Check(py_mod_name)) {
mod_name = PyUnicode_AsUTF8(py_mod_name);
}
Py_DECREF(py_mod_name);
}
else PyErr_Clear();
}
}
if (mod_name == nullptr) {
// Is it a built-in, like int or dict?
PyObject *builtins = PyEval_GetBuiltins();
if (PyDict_GetItemString(builtins, cls->tp_name) == (PyObject *)cls) {