mo2/modorganizer-plugin_python
0
0
Fork 0
mirror of https://github.com/ModOrganizer2/modorganizer-plugin_python.git synced 2026-07-27 14:03:33 -07:00
Code Issues Packages Projects Releases Wiki Activity

Continue implementing plugins.

Browse Source
This commit is contained in:
Mikaël Capelle
2022-04-25 21:21:06 +02:00
parent b92e3de535
commit 5ec456f880
6 changed files with 850 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/runner-pybind11/pythonrunner.cpp
+13 -19
View File
@@ -300,19 +300,19 @@ PythonRunner::PythonRunner() {}
PythonRunner::~PythonRunner()
{
// We need the GIL lock when destroying Python objects.
py::gil_scoped_acquire lock;
// m_Interpreter.reset();
// Boost.Python does not handle cyclic garbace collection, so we need to
// release everything hold by the objects before deleting the objects
// themselves: for (auto& [name, objects] : m_PythonObjects) {
// for (auto& obj : objects) {
// obj.attr("__dict__").attr("clear")();
// }
// Boost.Python does not handle cyclic garbace collection, so we need to release
// everything hold by the objects before deleting the objects themselves:
// for (auto& [name, objects] : m_PythonObjects) {
// for (auto& obj : objects) {
// obj.attr("__dict__").attr("clear")();
// }
// }
// m_PythonObjects.clear();
// we need to clear this here otherwise there is a crash in
// finalize_interpreter()
m_PythonObjects.clear();
py::finalize_interpreter();
}
// ErrWrapper is in error.h
@@ -331,13 +331,6 @@ bool PythonRunner::initPython()
try {
static const char* argv0 = "ModOrganizer.exe";
// we initialize the interpreter "the old way" because
// scoped_interpreter does not seem to work well with PyQt
wchar_t argBuffer[MAX_PATH];
const size_t cSize = strlen(argv0) + 1;
mbstowcs(argBuffer, argv0, MAX_PATH);
Py_SetProgramName(argBuffer);
PyImport_AppendInittab("mobase", &PyInit_mobase);
PyImport_AppendInittab("moprivate", &PyInit_moprivate);
@@ -345,7 +338,8 @@ bool PythonRunner::initPython()
Py_NoSiteFlag = 1;
initPath();
Py_InitializeEx(0);
py::initialize_interpreter(false, 1, &argv0);
if (!Py_IsInitialized()) {
return false;