-// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2016 CEA/DEN, EDF R&D, OPEN CASCADE
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// Date : 22/06/2007
//
#include "SUITApp_init_python.hxx"
+#include <QString>
+#if PY_VERSION_HEX < 0x03050000
+static char*
+Py_EncodeLocale(const wchar_t *arg, size_t *size)
+{
+ return _Py_wchar2char(arg, size);
+}
+static wchar_t*
+Py_DecodeLocale(const char *arg, size_t *size)
+{
+ return _Py_char2wchar(arg, size);
+}
+#endif
-PyThreadState* SUIT_PYTHON::_gtstate = NULL;
-PyObject *SUIT_PYTHON::salome_shared_modules_module = NULL;
-PyInterpreterState* SUIT_PYTHON::_interp = NULL;
bool SUIT_PYTHON::initialized = false;
void SUIT_PYTHON::init_python(int argc, char **argv)
{
return;
}
- Py_SetProgramName(argv[0]);
+
+ wchar_t **changed_argv = new wchar_t*[argc]; // Setting arguments
+ for (int i = 0; i < argc; i++)
+ {
+ changed_argv[i] = Py_DecodeLocale(argv[i], NULL);
+ }
+
+ Py_SetProgramName(changed_argv[0]);
Py_Initialize(); // Initialize the interpreter
- PySys_SetArgv(argc, argv);
- SUIT_PYTHON::_interp = PyThreadState_Get()->interp;
- PyEval_InitThreads(); // Create (and acquire) the interpreter lock
- SUIT_PYTHON::_gtstate = PyEval_SaveThread(); // Release global thread state
+
+ PySys_SetArgv(argc, changed_argv);
+ PyRun_SimpleString("import threading\n");
+ // VSR (22/09/2016): This is a workaround to prevent invoking qFatal() from PyQt5
+ // causing application aborting
+ QString script;
+ script += "def _custom_except_hook(exc_type, exc_value, exc_traceback):\n";
+ script += " import sys\n";
+ script += " sys.__excepthook__(exc_type, exc_value, exc_traceback)\n";
+ script += " pass\n";
+ script += "\n";
+ script += "import sys\n";
+ script += "sys.excepthook = _custom_except_hook\n";
+ script += "del _custom_except_hook, sys\n";
+ int res = PyRun_SimpleString(qPrintable(script));
+ // VSR (22/09/2016): end of workaround
+ PyEval_InitThreads(); // Create (and acquire) the interpreter lock - can be called many times
+ // Py_InitThreads acquires the GIL
+ PyThreadState *pts = PyGILState_GetThisThreadState();
+ PyEval_ReleaseThread(pts);
SUIT_PYTHON::initialized = true;
}
-