CCAR: import_hook.py was too strict in ensure_list (ImportError raised)

[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 d3d511712efcc53b4509cbd8c912534808f07de3..df48142b7f45543ca3516c82270e470f49c48b47 100644 (file)
--- a/src/Container/Container_init_python.cxx
+++ b/src/Container/Container_init_python.cxx
@@ -1,40 +1,40 @@
-//  SALOME Container : implementation of container and engine for Kernel
+//  Copyright (C) 2007-2010  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
 //
-//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS 
-// 
-//  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. 
-// 
-//  This library is distributed in the hope that it will be useful, 
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of 
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
-//  Lesser General Public License for more details. 
-// 
-//  You should have received a copy of the GNU Lesser General Public 
-//  License along with this library; if not, write to the Free Software 
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
-// 
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  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.
 //
+//  This library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//  Lesser General Public License for more details.
 //
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
+//  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>
-#include <sys/time.h>
+#ifndef WIN32
+  #include <sys/time.h>
+#endif
 
 #include "utilities.h"
 
 #include "Container_init_python.hxx"
 
-using namespace std;
-
 PyThreadState *KERNEL_PYTHON::_gtstate = 0;
 PyObject *KERNEL_PYTHON::salome_shared_modules_module = NULL;
 PyInterpreterState *KERNEL_PYTHON::_interp = NULL;
@@ -50,7 +50,11 @@ void KERNEL_PYTHON::init_python(int argc, char **argv)
   MESSAGE("=================================================================");
   MESSAGE("Python Initialization...");
   MESSAGE("=================================================================");
-  Py_SetProgramName(argv[0]);
+  // 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);
   Py_Initialize(); // Initialize the interpreter
   PySys_SetArgv(argc, argv);
   KERNEL_PYTHON::_interp = PyThreadState_Get()->interp;