Salome HOME
projects
/
modules
/
kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 e5e1369dbdb3749f814c73a99139cf979e7a8ef4..df48142b7f45543ca3516c82270e470f49c48b47 100644
(file)
--- a/
src/Container/Container_init_python.cxx
+++ b/
src/Container/Container_init_python.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
08
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-20
10
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-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-19,6
+19,7
@@
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
//
// 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
// SALOME Container : implementation of container and engine for Kernel
// File : Container_init_python.cxx
// Author : Paul RASCLE, EDF
@@
-34,8
+35,6
@@
#include "Container_init_python.hxx"
#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;
PyThreadState *KERNEL_PYTHON::_gtstate = 0;
PyObject *KERNEL_PYTHON::salome_shared_modules_module = NULL;
PyInterpreterState *KERNEL_PYTHON::_interp = NULL;
@@
-53,7
+52,9
@@
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);
MESSAGE("=================================================================");
// set stdout to line buffering (aka C++ std::cout)
setvbuf(stdout, (char *)NULL, _IOLBF, BUFSIZ);
- Py_SetProgramName(argv[0]);
+ 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;
Py_Initialize(); // Initialize the interpreter
PySys_SetArgv(argc, argv);
KERNEL_PYTHON::_interp = PyThreadState_Get()->interp;