Merge Python 3 porting.

[modules/smesh.git] / src / SMESH_SWIG / SMESH_test5.py

diff --git a/src/SMESH_SWIG/SMESH_test5.py b/src/SMESH_SWIG/SMESH_test5.py
index 749c9d9d91e031bf7588781dcc7b3c54892794f1..9ae62fbd4755d2aaa42954d992c9ee3dbf6277b3 100644 (file)
--- a/src/SMESH_SWIG/SMESH_test5.py
+++ b/src/SMESH_SWIG/SMESH_test5.py
@@ -1,5 +1,5 @@
 #  -*- coding: iso-8859-1 -*-
-# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -7,7 +7,7 @@
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
 # License as published by the Free Software Foundation; either
-# version 2.1 of the License.
+# version 2.1 of the License, or (at your option) any later version.
 #
 # This library is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -25,14 +25,19 @@
 #  Module : SMESH
 #
 import salome
-import smesh
-import SALOMEDS
+salome.salome_init()
+import GEOM
+from salome.geom import geomBuilder
+geompy = geomBuilder.New()
+
+import SMESH, SALOMEDS
+from salome.smesh import smeshBuilder
+smesh =  smeshBuilder.New()
+
 import CORBA
 import os
 import os.path
 
-smesh.SetCurrentStudy(salome.myStudy)
-
 def SetSObjName(theSObj,theName) :
     ok, anAttr = theSObj.FindAttribute("AttributeName")
     if ok:
@@ -43,37 +48,37 @@ def SetSObjName(theSObj,theName) :
 def ConvertMED2UNV(thePath,theFile) :
     anInitFileName = thePath + theFile
     aMeshes,aResult = smesh.CreateMeshesFromMED(anInitFileName)
-    print aResult, aMeshes
+    print(aResult, aMeshes)
 
     for iMesh in range(len(aMeshes)) :
         aMesh = aMeshes[iMesh]
-        print aMesh.GetName(),
+        print(aMesh.GetName(), end=' ')
         aFileName = anInitFileName
         aFileName = os.path.basename(aFileName)
         aMesh.SetName(aFileName)
-        print aMesh.GetName()
+        print(aMesh.GetName())
 
         aOutPath = '/tmp/'
         aFileName = aOutPath + theFile + "." + str(iMesh) + ".unv"
         aMesh.ExportUNV(aFileName)
         aMesh = smesh.CreateMeshesFromUNV(aFileName)
-        print aMesh.GetName(),
+        print(aMesh.GetName(), end=' ')
         os.remove(aFileName)
         aFileName = os.path.basename(aFileName)
         aMesh.SetName(aFileName)
-        print aMesh.GetName()
+        print(aMesh.GetName())
 
 aPath = os.getenv('DATA_DIR') + '/MedFiles/'
 aListDir = os.listdir(aPath)
-print aListDir
+print(aListDir)
 
 for iFile in range(len(aListDir)) :
     aFileName = aListDir[iFile]
     aName,anExt = os.path.splitext(aFileName)
     if anExt == ".med" :
         aFileName = os.path.basename(aFileName)
-        print aFileName
+        print(aFileName)
         ConvertMED2UNV(aPath,aFileName)
         #break
 
-salome.sg.updateObjBrowser(1)
+salome.sg.updateObjBrowser()