From: Paul RASCLE <paul.rascle@edf.fr>
Date: Wed, 5 Sep 2018 09:51:34 +0000 (+0200)
Subject: EDF bug 17743, salome.sg regressions in DEV (missing getAllSelected method)
X-Git-Tag: V9_1_0~5
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=ee44cdc8da140e8f0aabaa1b9d9485939899cfdf;p=modules%2Fkernel.git

EDF bug 17743, salome.sg regressions in DEV (missing getAllSelected method)
---

diff --git a/bin/runSalome.py b/bin/runSalome.py
index 63eb62f16..3aa96b092 100755
--- a/bin/runSalome.py
+++ b/bin/runSalome.py
@@ -700,7 +700,7 @@ def useSalome(args, modules_list, modules_root_dir):
                     toopen = args['study_hdf']
                     if toopen:
                         import salome
-                        salome.salome_init(toopen)
+                        salome.salome_init(path=toopen)
                 if 'pyscript' in args:
                     toimport = args['pyscript']
         from salomeContextUtils import formatScriptsAndArgs
diff --git a/src/KERNEL_PY/__init__.py b/src/KERNEL_PY/__init__.py
index 228bbf61d..cb8a968f0 100755
--- a/src/KERNEL_PY/__init__.py
+++ b/src/KERNEL_PY/__init__.py
@@ -164,8 +164,8 @@ if not flags:
 orb, lcc, naming_service, cm,sg=None,None,None,None,None
 myStudy, myStudyName=None,None
 
-salome_initial=1
-def salome_init(path=None, embedded=0):
+salome_initial=True
+def salome_init(path=None, embedded=False):
     """
     Performs only once SALOME general purpose initialisation for scripts.
     Provides:
@@ -184,7 +184,7 @@ def salome_init(path=None, embedded=0):
 
     try:
         if salome_initial:
-            salome_initial=0
+            salome_initial=False
             sg = salome_iapp_init(embedded)
             orb, lcc, naming_service, cm = salome_kernel_init()
             myStudy, myStudyName = salome_study_init(path)
@@ -212,7 +212,7 @@ def salome_close():
         myStudy.Clear()
     except:
         pass
-    salome_initial=1
+    salome_initial=True
     salome_iapp_close()
     pass