From: Gilles DAVID <gilles-g.david@edf.fr>
Date: Tue, 18 Apr 2017 13:23:17 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/V8_3_BR' into ngr/python3_dev
X-Git-Tag: V9_0_0~7^2~8
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=6ea08066cb76ea0e557d89789037f3fd1a03e0fb;p=modules%2Fgui.git

Merge remote-tracking branch 'origin/V8_3_BR' into ngr/python3_dev
---

6ea08066cb76ea0e557d89789037f3fd1a03e0fb
diff --cc tools/CurvePlot/src/python/views/XYView.py
index d457b4cfc,42ad149ec..ba3ca5731
--- a/tools/CurvePlot/src/python/views/XYView.py
+++ b/tools/CurvePlot/src/python/views/XYView.py
@@@ -688,15 -688,15 +688,15 @@@ class XYView(View)
      #  point = event.canvas.mapToGlobal(QtCore.QPoint(event.x,canvasSize.height()-event.y))
      #  self._popupMenu.move(point)
      #  self._popupMenu.show()
-    
+ 
    def onMotionEvent(self, event):
 -    print "OnMotionEvent ",event.button
 +    print("OnMotionEvent ",event.button)
      #if event.button == 3 :
      #  event.button = None
      #  return True
-    
+ 
    def onReleaseEvent(self, event):
 -    print "OnReleaseEvent ",event.button
 +    print("OnReleaseEvent ",event.button)
      #if event.button == 3 :
      #  event.button = None
      #  return False
diff --cc tools/PyInterp/src/PyInterp_Interp.cxx
index 27703c2a0,200649073..1caeece65
--- a/tools/PyInterp/src/PyInterp_Interp.cxx
+++ b/tools/PyInterp/src/PyInterp_Interp.cxx
@@@ -242,19 -242,12 +242,19 @@@ void PyInterp_Interp::initPython(
  {
    if (!Py_IsInitialized()){
      // Python is not initialized
 -    Py_SetProgramName(_argv[0]);
 +    wchar_t **changed_argv = new wchar_t*[_argc]; // Setting arguments
 +    size_t mbslen;
 +    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);
 +    PySys_SetArgv(_argc, changed_argv);
  
      PyEval_InitThreads(); // Create (and acquire) the Python global interpreter lock (GIL)
-     PyEval_ReleaseLock();
+     PyEval_SaveThread(); // release safely GIL
    }
  }