kindred/create
1
1
Fork 0
Code Issues 44 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Gui: Consolidate module error message in PythonWrapper

Browse Source
This commit is contained in:
Ladislav Michl
2024-01-19 19:02:58 +01:00
parent cf3d084ca2
commit 3dd2fc8f0f
1 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/Gui/PythonWrapper.cpp
View File

@@ -354,6 +354,13 @@ private:
~WrapperManager() override = default;
};
static std::string formatModuleError(std::string name)
{
std::string error = "Cannot load " + name + " module";
PyErr_Print();
return error;
}
template<typename qttype>
Py::Object qt_wrapInstance(qttype object,
const std::string& className,
@@ -363,10 +370,7 @@ Py::Object qt_wrapInstance(qttype object,
{
PyObject* module = PyImport_ImportModule(shiboken.c_str());
if (!module) {
std::string error = "Cannot load ";
error += shiboken;
error += " module";
throw Py::Exception(PyExc_ImportError, error);
throw Py::Exception(PyExc_ImportError, formatModuleError(shiboken));
}
Py::Module mainmod(module, true);
@@ -377,10 +381,7 @@ Py::Object qt_wrapInstance(qttype object,
module = PyImport_ImportModule(pyside.c_str());
if (!module) {
std::string error = "Cannot load ";
error += pyside;
error += " module";
throw Py::Exception(PyExc_ImportError, error);
throw Py::Exception(PyExc_ImportError, formatModuleError(pyside));
}
Py::Module qtmod(module);
@@ -392,10 +393,7 @@ const char* qt_identifyType(QObject* ptr, const std::string& pyside)
{
PyObject* module = PyImport_ImportModule(pyside.c_str());
if (!module) {
std::string error = "Cannot load ";
error += pyside;
error += " module";
throw Py::Exception(PyExc_ImportError, error);
throw Py::Exception(PyExc_ImportError, formatModuleError(pyside));
}
Py::Module qtmod(module);
@@ -415,10 +413,7 @@ void* qt_getCppPointer(const Py::Object& pyobject, const std::string& shiboken,
// https://github.com/PySide/Shiboken/blob/master/shibokenmodule/typesystem_shiboken.xml
PyObject* module = PyImport_ImportModule(shiboken.c_str());
if (!module) {
std::string error = "Cannot load ";
error += shiboken;
error += " module";
throw Py::Exception(PyExc_ImportError, error);
throw Py::Exception(PyExc_ImportError, formatModuleError(shiboken));
}
Py::Module mainmod(module, true);