appying 2to3

[modules/hydro.git] / doc / salome / examples / h014_caseDigueManualInterpolZ.py

diff --git a/doc/salome/examples/h014_caseDigueManualInterpolZ.py b/doc/salome/examples/h014_caseDigueManualInterpolZ.py
index 0b34a67aa823a5c96c5452de0c61f41ecfc494f1..09b302c2fadc3fb99e4d97419b5e5b173dba069d 100644 (file)
--- a/doc/salome/examples/h014_caseDigueManualInterpolZ.py
+++ b/doc/salome/examples/h014_caseDigueManualInterpolZ.py
@@ -402,10 +402,10 @@ from salome.hydrotools.controls import controlGeomProps
 
 geompy = geomBuilder.New(theStudy)
 
-print "Entry:", garonne_1_entry
+print("Entry:", garonne_1_entry)
 HYDRO_garonne_1 = salome.IDToObject( str( garonne_1_entry ) )
-print "Geom shape:", HYDRO_garonne_1
-print "Geom shape name:", HYDRO_garonne_1.GetName()
+print("Geom shape:", HYDRO_garonne_1)
+print("Geom shape name:", HYDRO_garonne_1.GetName())
 
 
 [garonne_riveGauche,garonne_digue,garonne_litMineur,garonne_riveDroite] = geompy.ExtractShapes(HYDRO_garonne_1, geompy.ShapeType["FACE"], True)
@@ -418,14 +418,14 @@ controlGeomProps(geompy, garonne_riveDroite,  32012.343241, 25998769.23615)
 # --- manual identification of all useful edge groups (boundary conditions)
 
 allEdgesIds = geompy.SubShapeAllIDs(HYDRO_garonne_1, geompy.ShapeType["EDGE"])
-print "allEdgesIds", allEdgesIds
+print("allEdgesIds", allEdgesIds)
 
 (isDone, ClosedFreeBoundary, OpenFreeBoundary) = geompy.GetFreeBoundary(HYDRO_garonne_1)
 geompy.addToStudyInFather(HYDRO_garonne_1, ClosedFreeBoundary[0], "ClosedFreeBoundary")
 
 freeBoundary = geompy.ExtractShapes(ClosedFreeBoundary[0], geompy.ShapeType["EDGE"], True)
 freeBoundaryIds = [ geompy.GetSubShapeID(HYDRO_garonne_1, freeBoundary[i]) for i in range(len(freeBoundary)) ]
-print "freeBoundaryIds", freeBoundaryIds
+print("freeBoundaryIds", freeBoundaryIds)
 
 [litMineur_droite] = geompy.GetSharedShapesMulti([garonne_riveDroite, garonne_litMineur], geompy.ShapeType["EDGE"], True)
 [litMineur_gauche] = geompy.GetSharedShapesMulti([garonne_riveGauche, garonne_litMineur], geompy.ShapeType["EDGE"], True)
@@ -433,7 +433,7 @@ geompy.addToStudyInFather(HYDRO_garonne_1, litMineur_droite, "litMineur_droite")
 geompy.addToStudyInFather(HYDRO_garonne_1, litMineur_gauche, "litMineur_gauche")
 rives = [litMineur_droite, litMineur_gauche]
 rivesIds = [ geompy.GetSubShapeID(HYDRO_garonne_1, rives[i]) for i in range(len(rives)) ]
-print "rivesIds", rivesIds
+print("rivesIds", rivesIds)
 
 edges_litMineur = geompy.GetSharedShapesMulti([HYDRO_garonne_1, garonne_litMineur], geompy.ShapeType["EDGE"], True)
 edges_riveGauche = geompy.GetSharedShapesMulti([HYDRO_garonne_1, garonne_riveGauche], geompy.ShapeType["EDGE"], True)
@@ -442,20 +442,20 @@ edges_litMineurIds = [ geompy.GetSubShapeID(HYDRO_garonne_1, edges_litMineur[i])
 edges_riveGaucheIds = [ geompy.GetSubShapeID(HYDRO_garonne_1, edges_riveGauche[i]) for i in range(len(edges_riveGauche)) ]
 edges_riveDroiteIds = [ geompy.GetSubShapeID(HYDRO_garonne_1, edges_riveDroite[i]) for i in range(len(edges_riveDroite)) ]
 
-print "edges_litMineurIds", edges_litMineurIds 
-print "edges_riveGaucheIds", edges_riveGaucheIds
-print "edges_riveDroiteIds", edges_riveDroiteIds
+print("edges_litMineurIds", edges_litMineurIds) 
+print("edges_riveGaucheIds", edges_riveGaucheIds)
+print("edges_riveDroiteIds", edges_riveDroiteIds)
 
 sectionsIds = [Id for Id in edges_litMineurIds if Id not in rivesIds]
-print "sectionsIds", sectionsIds
+print("sectionsIds", sectionsIds)
 SectionsGaronne = geompy.CreateGroup(HYDRO_garonne_1, geompy.ShapeType["EDGE"])
 geompy.UnionIDs(SectionsGaronne, sectionsIds)
 geompy.addToStudyInFather(HYDRO_garonne_1, SectionsGaronne, "SectionsGaronne")
 
 bordGaucheDomaineIds = [Id for Id in freeBoundaryIds if Id in edges_riveGaucheIds]
 bordDroiteDomaineIds = [Id for Id in freeBoundaryIds if Id in edges_riveDroiteIds]
-print "bordGaucheDomaineIds", bordGaucheDomaineIds
-print "bordDroiteDomaineIds", bordDroiteDomaineIds
+print("bordGaucheDomaineIds", bordGaucheDomaineIds)
+print("bordDroiteDomaineIds", bordDroiteDomaineIds)
 bordGaucheDomaine = geompy.CreateGroup(HYDRO_garonne_1, geompy.ShapeType["EDGE"])
 geompy.UnionIDs(bordGaucheDomaine, bordGaucheDomaineIds)
 geompy.addToStudyInFather(HYDRO_garonne_1, bordGaucheDomaine, "bordGaucheDomaine")
@@ -567,13 +567,13 @@ SectionsDigue_2 = garonne_1.GroupOnGeom(SectionsDigue,'SectionsDigue',SMESH.NODE
 
 garonne_1.SetAutoColor( 1 )
 tmpdir = tempfile.mkdtemp()
-print "tmpdir=",tmpdir
+print("tmpdir=",tmpdir)
 fichierMaillage = os.path.join(tmpdir, 'garonne_1.med')
 garonne_1.ExportMED(fichierMaillage, 0, SMESH.MED_V2_2, 1, None ,1)
 
 mesures = garonne_1.GetMeshInfo()
 d= {}
-for key, value in mesures.iteritems():
+for key, value in mesures.items():
   d[str(key)] = value
 nbTriangles = d['Entity_Triangle']
 nbNodes = d['Entity_Node']