Differential D26550 Diff 73144 scripting/python_scripter.cc

Changeset View

Standalone View

View Options

scripting/python_scripter.cc

Context not available.
427PythonScripter::~PythonScripter() 427​PythonScripter::~PythonScripter()
428{ 428​{
429 PyErr_Clear(); 429​ PyErr_Clear();
430 Py_Finalize(); 430​ /*
431​ * Franco:
432​ *
433​ * 'delete' line moved up before the Py_Finalize() call
434​ * see bug https://bugs.kde.org/show_bug.cgi?id=416037
435​ */
431 delete d; 436​ delete d;
437​ Py_FinalizeEx();
wbauerUnsubmitted
Not Done

This breaks the build with python2 though.

Maybe add a conditional like it's done in https://cgit.kde.org/kig.git/commit/?id=c0aa768f28219ce8b3c275a6d13ad69757e3c7af ?

wbauer: This breaks the build with python2 though. Maybe add a conditional like it's done in https…
paoliniAuthorUnsubmitted
Not Done

Actually Py_Finalze() should still work for compatibility reasons in python3, so we could simply
substitute Py_FinalizeEx() with Py_Finalize()

paolini: Actually Py_Finalze() should still work for compatibility reasons in python3, so we could…
wbauerUnsubmitted
Not Done

I saw now that Py_FinalizeEx() exists only since python version 3.6.
So this should be changed anyway, even if we don't care for python2 anymore.

But yes, it's probably best to just switch back to Py_Finalize(), I suppose. The return value is not checked anyway.

wbauer: I saw now that Py_FinalizeEx() exists only since python version 3.6. So this should be changed…
432} 438​}
433 439​
434class CompiledPythonScript::Private 440​class CompiledPythonScript::Private
Context not available.