X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FPYHELLO%2FPYHELLO.py;fp=src%2FPYHELLO%2FPYHELLO.py;h=3303c8fdd1dd94e99e2d6241b119163faec4977f;hb=07c0897d109f195fb52301a591e59dad594bc93c;hp=c5540f94e591c8f639146edbc22c048f2ea9403c;hpb=00270d695e8c6d211e3da128665593e15edb7db1;p=samples%2Fpyhello.git diff --git a/src/PYHELLO/PYHELLO.py b/src/PYHELLO/PYHELLO.py index c5540f9..3303c8f 100755 --- a/src/PYHELLO/PYHELLO.py +++ b/src/PYHELLO/PYHELLO.py @@ -29,8 +29,7 @@ import PYHELLO_ORB__POA import SALOME_ComponentPy import SALOME_DriverPy import SALOMEDS - -from PYHELLO_utils import * +from PYHELLO_utils import findOrCreateComponent, objectID, moduleName class PYHELLO(PYHELLO_ORB__POA.PYHELLO_Gen, SALOME_ComponentPy.SALOME_ComponentPy_i, @@ -97,11 +96,11 @@ class PYHELLO(PYHELLO_ORB__POA.PYHELLO_Gen, study = getStudy() father = study.FindComponent( moduleName() ) if father: - iter = study.NewChildIterator( father ) - while iter.More(): - name = iter.Value().GetName() + iterator = study.NewChildIterator(father) + while iterator.More(): + name = iterator.Value().GetName() if name: names.append( name ) - iter.Next() + iterator.Next() pass pass if names: @@ -110,12 +109,12 @@ class PYHELLO(PYHELLO_ORB__POA.PYHELLO_Gen, abuffer += [ "" ] abuffer += [ "pyhello = salome.lcc.FindOrLoadComponent( 'FactoryServerPy', '%s' )" % moduleName() ] abuffer += [ "" ] - abuffer += [ "pyhello.createObject( '%s' )" % name for name in names ] + abuffer += [ "pyhello.createObject( '%s')" % name for name in names ] abuffer += [ "" ] pass if isMultiFile: - abuffer = [ " " + s for s in abuffer ] - abuffer[0:0] = [ "def RebuildData():" ] - abuffer += [ " pass" ] + abuffer = [ " " + s for s in abuffer ] + abuffer[0:0] = [ "def RebuildData():" ] + abuffer += [ " pass" ] abuffer += [ "\0" ] return ("\n".join( abuffer ), 1)