From 6ec51cd02df5dc495cb513a6b5f65144b6a04378 Mon Sep 17 00:00:00 2001 From: rnv Date: Thu, 23 Dec 2021 18:01:23 +0300 Subject: [PATCH] Remove deprecated container "FactoryServerPy". --- bin/runPYHELLO.py | 4 ++-- src/PYHELLO/PYHELLO.py | 2 +- src/PYHELLO/PYHELLO_utils.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/runPYHELLO.py b/bin/runPYHELLO.py index 4e5aa40..cc5157c 100755 --- a/bin/runPYHELLO.py +++ b/bin/runPYHELLO.py @@ -30,7 +30,7 @@ def test(clt): import LifeCycleCORBA lcc = LifeCycleCORBA.LifeCycleCORBA(clt.orb) import PYHELLO_ORB - pyhello = lcc.FindOrLoadComponent("FactoryServerPy", "PYHELLO") + pyhello = lcc.FindOrLoadComponent("FactoryServer", "PYHELLO") return pyhello # @@ -51,4 +51,4 @@ if __name__ == "__main__": session=clt.waitNS("/Kernel/Session") catalog=clt.waitNS("/Kernel/ModulCatalog") import socket - container = clt.waitNS("/Containers/" + socket.gethostname().split('.')[0] + "/FactoryServerPy") + container = clt.waitNS("/Containers/" + socket.gethostname().split('.')[0] + "/FactoryServer") diff --git a/src/PYHELLO/PYHELLO.py b/src/PYHELLO/PYHELLO.py index 29cca24..d65efd5 100644 --- a/src/PYHELLO/PYHELLO.py +++ b/src/PYHELLO/PYHELLO.py @@ -112,7 +112,7 @@ class PYHELLO(PYHELLO_ORB__POA.PYHELLO_Gen, abuffer += [ "import salome" ] abuffer += [ "import PYHELLO_ORB" ] abuffer += [ "" ] - abuffer += [ "pyhello = salome.lcc.FindOrLoadComponent( 'FactoryServerPy', '%s' )" % moduleName() ] + abuffer += [ "pyhello = salome.lcc.FindOrLoadComponent( 'FactoryServer', '%s' )" % moduleName() ] abuffer += [ "" ] abuffer += [ "pyhello.createObject( '%s')" % name for name in names ] abuffer += [ "" ] diff --git a/src/PYHELLO/PYHELLO_utils.py b/src/PYHELLO/PYHELLO_utils.py index 94d47d2..c5246ec 100644 --- a/src/PYHELLO/PYHELLO_utils.py +++ b/src/PYHELLO/PYHELLO_utils.py @@ -124,7 +124,7 @@ __engine__ = None def getEngine(): global __engine__ if __engine__ is None: - __engine__ = getLCC().FindOrLoadComponent( "FactoryServerPy", moduleName() ) + __engine__ = getLCC().FindOrLoadComponent( "FactoryServer", moduleName() ) pass return __engine__ -- 2.30.2