X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FContainer%2FContainer_init_python.cxx;h=26a40b4550cea08b4810c91bb9d237d28202277b;hb=3ce0546302001755828c8476425a60c6ab61ac92;hp=beaea103bfdf3e5adc7a5800858ecc932e3fa619;hpb=910e1b8c12ac2978e64847e9694b080c8381bc60;p=modules%2Fkernel.git

diff --git a/src/Container/Container_init_python.cxx b/src/Container/Container_init_python.cxx
index beaea103b..26a40b455 100644
--- a/src/Container/Container_init_python.cxx
+++ b/src/Container/Container_init_python.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2024  CEA, EDF, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -73,7 +73,7 @@ ContainerPyStdOut_write(ContainerPyStdOut *self, PyObject *args)
 }
 
 static PyObject*
-ContainerPyStdOut_flush(ContainerPyStdOut *self)
+ContainerPyStdOut_flush(ContainerPyStdOut */*self*/, PyObject */*args*/)
 {
   Py_INCREF(Py_None);
   return Py_None;
@@ -82,13 +82,12 @@ ContainerPyStdOut_flush(ContainerPyStdOut *self)
 static PyMethodDef ContainerPyStdOut_methods[] = {
   {"write",  (PyCFunction)ContainerPyStdOut_write,  METH_VARARGS, PyDoc_STR("write(string) -> None")},
   {"flush",  (PyCFunction)ContainerPyStdOut_flush,  METH_NOARGS,  PyDoc_STR("flush() -> None")},
-  {NULL,    NULL}   /* sentinel */
+  {0, 0, 0, 0} /* sentinel */
 };
 
 static PyMemberDef ContainerPyStdOut_memberlist[] = {
-      {(char*)"softspace", T_INT,  offsetof(ContainerPyStdOut, softspace), 0,
-       (char*)"flag indicating that a space needs to be printed; used by print"},
-      {NULL} /* Sentinel */
+  {(char*)"softspace", T_INT,  offsetof(ContainerPyStdOut, softspace), 0, (char*)"flag indicating that a space needs to be printed; used by print"},
+  {0, 0, 0, 0, 0} /* sentinel */
 };
 
 static PyTypeObject ContainerPyStdOut_Type = {
@@ -166,12 +165,8 @@ void KERNEL_PYTHON::init_python(int argc, char **argv)
       MESSAGE("Python already initialized");
       return;
     }
-  MESSAGE("=================================================================");
-  MESSAGE("Python Initialization...");
-  MESSAGE("=================================================================");
   // set stdout to line buffering (aka C++ std::cout)
   setvbuf(stdout, (char *)NULL, _IOLBF, BUFSIZ);
-  wchar_t* salome_python;
   char* env_python=getenv("SALOME_PYTHON");
   if(env_python != 0)
     {
@@ -181,7 +176,7 @@ void KERNEL_PYTHON::init_python(int argc, char **argv)
   Py_Initialize(); // Initialize the interpreter
   if (Py_IsInitialized())
     {
-      MESSAGE("Python initialized eh eh eh");
+      MESSAGE("Python initialized");
     }
   wchar_t **changed_argv = new wchar_t*[argc]; // Setting arguments
   for (int i = 0; i < argc; i++)
@@ -202,10 +197,11 @@ void KERNEL_PYTHON::init_python(int argc, char **argv)
   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());
+  PyRun_SimpleString(script.c_str());
   // VSR (22/09/2016): end of workaround
+#if PY_VERSION_HEX < 0x03070000
   PyEval_InitThreads(); // Create (and acquire) the interpreter lock
-
+#endif
   // Create python objects to capture stdout and stderr
   PyObject* _vout=(PyObject*)ContainerNewPyStdOut( false ); // stdout
   PyObject* _verr=(PyObject*)ContainerNewPyStdOut( true );  // stderr