[PY3] Simplification of Py_EncodeLocale and Py_DecodeLocale

[modules/kernel.git] / src / Container / Container_init_python.cxx

diff --git a/src/Container/Container_init_python.cxx b/src/Container/Container_init_python.cxx
index 7a9427c4af2027439ce7b13262009ba83d150342..d5e58db8b55b23fc7b584dd2f7367b16c9552a3b 100644 (file)
--- a/src/Container/Container_init_python.cxx
+++ b/src/Container/Container_init_python.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2014  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -20,21 +20,28 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-//  SALOME Container : implementation of container and engine for Kernel
-//  File   : Container_init_python.cxx
-//  Author : Paul RASCLE, EDF
-//  Module : KERNEL
-//  $Header$
-//
 #include <time.h>
 #ifndef WIN32
   #include <sys/time.h>
 #endif
+#include <string>
 
 #include "utilities.h"
-
 #include "Container_init_python.hxx"
 
+#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
+
 void KERNEL_PYTHON::init_python(int argc, char **argv)
 {
   if (Py_IsInitialized())
@@ -47,14 +54,42 @@ void KERNEL_PYTHON::init_python(int argc, char **argv)
   MESSAGE("=================================================================");
   // set stdout to line buffering (aka C++ std::cout)
   setvbuf(stdout, (char *)NULL, _IOLBF, BUFSIZ);
-  char* salome_python=getenv("SALOME_PYTHON");
-  if(salome_python != 0)
-    Py_SetProgramName(salome_python);
+  wchar_t* salome_python;
+  char* env_python=getenv("SALOME_PYTHON");
+  if(env_python != 0)
+    {
+      wchar_t* salome_python = Py_DecodeLocale(env_python, NULL);
+      Py_SetProgramName(salome_python);
+    }
   Py_Initialize(); // Initialize the interpreter
-  PySys_SetArgv(argc, argv);
+  if (Py_IsInitialized())
+    {
+      MESSAGE("Python initialized eh eh eh");
+    }
+  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);
+  }
+  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
+  std::string 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(script.c_str());
+  // VSR (22/09/2016): end of workaround
   PyEval_InitThreads(); // Create (and acquire) the interpreter lock
   PyThreadState *pts = PyGILState_GetThisThreadState(); 
-  PyEval_ReleaseThread(pts);  
+  PyEval_ReleaseThread(pts);
+  //delete[] changed_argv;
 }