Merge Python 3 porting.

diff --git a/doc/salome/examples/hexoticsubdom1.py b/doc/salome/examples/hexoticsubdom1.py
index c570ec56c6b99ea30e279550cb70470b4b94a566..28f5b650af0c17385ccde635e651c9bbd92929c4 100644 (file)
--- a/doc/salome/examples/hexoticsubdom1.py
+++ b/doc/salome/examples/hexoticsubdom1.py
@@ -51,7 +51,7 @@ aFilter2 = smesh.GetFilterFromCriteria([smesh.GetCriterion(SMESH.VOLUME,SMESH.FT
 aFilter3 = smesh.GetFilter(SMESH.VOLUME,SMESH.FT_BelongToGeom,'=',Sphere_1, SMESH.FT_LogicalNOT)
 
 # Create mesh of Cut_2 with sd mode 1
-print "Create mesh of Cut_2 with sd mode 1"
+print("Create mesh of Cut_2 with sd mode 1")
 Mesh_mghexa_sd1 = smesh.Mesh(Cut_2, "Mesh_mghexa_sd1")
 
 # Create the 2D algo: MG-CADSurf with geometrical mesh

diff --git a/doc/salome/examples/hexoticsubdom2.py b/doc/salome/examples/hexoticsubdom2.py
index 1217806596fba6830a30d04fa2ff91f7a42024d0..62a82bbfb01696989a7626bc9de6397b20db226c 100644 (file)
--- a/doc/salome/examples/hexoticsubdom2.py
+++ b/doc/salome/examples/hexoticsubdom2.py
@@ -50,7 +50,7 @@ aFilter2 = smesh.GetFilterFromCriteria([smesh.GetCriterion(SMESH.VOLUME,SMESH.FT
 aFilter3 = smesh.GetFilter(SMESH.VOLUME,SMESH.FT_BelongToGeom,'=',Sphere_1, SMESH.FT_LogicalNOT)
 
 # Create mesh of Cut_2 with sd mode 2
-print "Create mesh of Cut_2 with sd mode 2"
+print("Create mesh of Cut_2 with sd mode 2")
 Mesh_mghexa_sd2 = smesh.Mesh(Cut_2, "Mesh_mghexa_sd2")
 
 # Create the 2D algo: MG-CADSurf with geometrical mesh

diff --git a/doc/salome/examples/hexoticsubdom3.py b/doc/salome/examples/hexoticsubdom3.py
index 0f6898e89222a69ecdfd73551bebfda1e5dd9c22..ae1a151f67c49ce012f3c104154b7091c3d111ff 100644 (file)
--- a/doc/salome/examples/hexoticsubdom3.py
+++ b/doc/salome/examples/hexoticsubdom3.py
@@ -50,7 +50,7 @@ aFilter2 = smesh.GetFilterFromCriteria([smesh.GetCriterion(SMESH.VOLUME,SMESH.FT
 aFilter3 = smesh.GetFilter(SMESH.VOLUME,SMESH.FT_BelongToGeom,'=',Sphere_1, SMESH.FT_LogicalNOT)
 
 # Create mesh of Cut_2 with sd mode 3
-print "Create mesh of Cut_2 with sd mode 3"
+print("Create mesh of Cut_2 with sd mode 3")
 Mesh_mghexa_sd3 = smesh.Mesh(Cut_2, "Mesh_mghexa_sd3")
 
 # Create the 2D algo: MG-CADSurf with geometrical mesh

diff --git a/src/HexoticPlugin/HexoticPLUGINBuilder.py b/src/HexoticPlugin/HexoticPLUGINBuilder.py
index 7fd42cead0a8bb5f027e9851159de80cd5c30a1a..684f63876ac496f953d7648effd7618dc9bddbd5 100644 (file)
--- a/src/HexoticPlugin/HexoticPLUGINBuilder.py
+++ b/src/HexoticPlugin/HexoticPLUGINBuilder.py
@@ -70,7 +70,7 @@ class Hexotic_Algorithm(Mesh_Algorithm):
     #              if it is @c 0 (default), the algorithm is assigned to the main shape
     def __init__(self, mesh, geom=0):
         Mesh_Algorithm.__init__(self)
-        if noHexoticPlugin: print "Warning: HexoticPlugin module unavailable"
+        if noHexoticPlugin: print("Warning: HexoticPlugin module unavailable")
         self.Create(mesh, geom, MG_Hexa, "libHexoticEngine.so")
         self.params = None
         pass
@@ -100,7 +100,7 @@ class Hexotic_Algorithm(Mesh_Algorithm):
     def SetSizeMap(self, theObject, theSize):
         AssureGeomPublished( self.mesh, theObject )
         if theSize <= 0:
-          raise ValueError, "The size must be > 0"
+          raise ValueError("The size must be > 0")
         self.Parameters().SetSizeMap(theObject, theSize)
         return self.Parameters()
       
@@ -125,7 +125,7 @@ class Hexotic_Algorithm(Mesh_Algorithm):
     #  @param quad not documented
     #  @return hypothesis object
     def MinMaxQuad(self, min=3, max=8, quad=True):
-        print "WARNING: Function MinMaxQuad is deprecated, use SetMinMaxHexes instead"
+        print("WARNING: Function MinMaxQuad is deprecated, use SetMinMaxHexes instead")
         return self.SetMinMaxHexes(min, max)
       
     ## Defines "ViscousLayers" hypothesis to give MG-Hexa parameters