From d8e0521ce095e6b75612544e0d3c169549004696 Mon Sep 17 00:00:00 2001 From: Gilles DAVID Date: Tue, 22 Oct 2024 18:31:35 +0200 Subject: [PATCH] =?utf8?q?salome=5Fkernel.py=20devient=20salome=5Fkernel?= =?utf8?q?=5Futils.py=20pour=20=C3=A9viter=20les=20conflits?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/KERNEL_PY/CMakeLists.txt | 2 +- src/KERNEL_PY/__init__.py | 4 ++-- src/KERNEL_PY/kernel/__init__.py | 2 +- src/KERNEL_PY/{salome_kernel.py => salome_kernel_utils.py} | 0 src/KERNEL_PY/salome_study.py | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) rename src/KERNEL_PY/{salome_kernel.py => salome_kernel_utils.py} (100%) diff --git a/src/KERNEL_PY/CMakeLists.txt b/src/KERNEL_PY/CMakeLists.txt index 0ae46169f..e9cc0213c 100644 --- a/src/KERNEL_PY/CMakeLists.txt +++ b/src/KERNEL_PY/CMakeLists.txt @@ -30,7 +30,7 @@ SET(salomepython_PYTHON batchmode_salome.py kernel_test.py salome_test.py - salome_kernel.py + salome_kernel_utils.py salome_study.py salome_iapp.py salome_ComponentGUI.py diff --git a/src/KERNEL_PY/__init__.py b/src/KERNEL_PY/__init__.py index 822df2c6a..a0d24c0d4 100644 --- a/src/KERNEL_PY/__init__.py +++ b/src/KERNEL_PY/__init__.py @@ -119,7 +119,7 @@ extend_path(ROOT_PYTHONPACKAGE_NAME) # ========================================================================== # -from salome_kernel import * +from salome_kernel_utils import * from salome_study import * from salome_iapp import * import salome_study @@ -225,7 +225,7 @@ def salome_init_without_session_common(path=None, embedded=False): orb=CORBA.ORB_init(['']) import KernelModuleCatalog import SALOME_ModuleCatalog - from salome_kernel import list_of_catalogs_regarding_environement + from salome_kernel_utils import list_of_catalogs_regarding_environement modulcat = KernelModuleCatalog.myModuleCatalog( list_of_catalogs_regarding_environement() ) # poa = orb.resolve_initial_references("RootPOA") diff --git a/src/KERNEL_PY/kernel/__init__.py b/src/KERNEL_PY/kernel/__init__.py index 7e311ef23..07cf3afc8 100644 --- a/src/KERNEL_PY/kernel/__init__.py +++ b/src/KERNEL_PY/kernel/__init__.py @@ -18,7 +18,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -## \defgroup salome_kernel salome.kernel +## \defgroup salome_kernel_utils salome.kernel # \{ # \details Package containing the KERNEL python utilities # \defgroup deprecation diff --git a/src/KERNEL_PY/salome_kernel.py b/src/KERNEL_PY/salome_kernel_utils.py similarity index 100% rename from src/KERNEL_PY/salome_kernel.py rename to src/KERNEL_PY/salome_kernel_utils.py diff --git a/src/KERNEL_PY/salome_study.py b/src/KERNEL_PY/salome_study.py index 048c67d1b..de6c6cc77 100644 --- a/src/KERNEL_PY/salome_study.py +++ b/src/KERNEL_PY/salome_study.py @@ -26,7 +26,7 @@ # Module : SALOME # $Header$ # -import salome_kernel +import salome_kernel_utils import SALOMEDS import salome_iapp from launchConfigureParser import verbose @@ -323,7 +323,7 @@ def salome_study_init(theStudyPath=None): global orb, lcc, naming_service, cm if not myStudy: - orb, lcc, naming_service, cm, _, _, _ = salome_kernel.salome_kernel_init() + orb, lcc, naming_service, cm, _, _, _ = salome_kernel_utils.salome_kernel_init() # get Study reference obj = naming_service.Resolve('/Study') -- 2.39.2