Porting to Python 3 (1st draft)

diff --git a/bin/runCALCULATOR.in b/bin/runCALCULATOR.in
index 96b85f8b039a1dfb98e4642e38d7beedc58e3d02..1984284a2848bf9815c464fecf6c98a422539541 100755 (executable)
--- a/bin/runCALCULATOR.in
+++ b/bin/runCALCULATOR.in
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
@@ -41,7 +41,7 @@ searchFreePort() {
             local myhost=`hostname`
             export OMNIORB_CONFIG=${HOME}/.omniORB_${myhost}_${NSPORT}.cfg
             local initref="NameService=corbaname::"`hostname`":$NSPORT"
-            if [[ `python -c "import CORBA; print CORBA.ORB_ID"` = "omniORB4" ]]; then
+            if [[ `python -c "import CORBA; print(CORBA.ORB_ID)"` = "omniORB4" ]]; then
                 echo "InitRef = $initref" > ${OMNIORB_CONFIG}
             else
                 echo "ORBInitRef $initref" > ${OMNIORB_CONFIG}

diff --git a/bin/runCALCULATOR.py b/bin/runCALCULATOR.py
index dcb08f89a629a0cee615fe00b39e160bc07e5b5a..9d3b708c758b5127aca9214225f561dc79c21939 100755 (executable)
--- a/bin/runCALCULATOR.py
+++ b/bin/runCALCULATOR.py
@@ -47,13 +47,13 @@ if __name__ == "__main__":
      clt.waitNS("/Containers/" + getShortHostName() + "/FactoryServer")
      __orb = clt.orb
 
-     print
-     print "Use calculator() function to get access to the CALCULATOR component."
-     print "Example: calc = calculator()"
-     print "..."
-     print
+     print()
+     print("Use calculator() function to get access to the CALCULATOR component.")
+     print("Example: calc = calculator()")
+     print("...")
+     print()
      pass
    else:
-      print "ERROR: SALOME is not initialized"
+      print("ERROR: SALOME is not initialized")
       pass
    pass

diff --git a/src/CALCULATOR/CALCULATOR_TEST.py b/src/CALCULATOR/CALCULATOR_TEST.py
index a80d02f24bbf07ff1b9f4ff7af90a5eb184c2097..d5ca7519a1ad5c963f7f649e4fe3d2ace6c66180 100755 (executable)
--- a/src/CALCULATOR/CALCULATOR_TEST.py
+++ b/src/CALCULATOR/CALCULATOR_TEST.py
@@ -42,65 +42,65 @@ fieldName = "fieldcelldoublevector"
 salome.salome_init()
 
 # Get MED component
-print "[CALC] Get reference to MED component ..."
+print("[CALC] Get reference to MED component ...")
 med = salome.lcc.FindOrLoadComponent("FactoryServer", "MED")
-print "[CALC] ---"
+print("[CALC] ---")
 
 # Get CALCULATOR component
-print "[CALC] Get reference to CALCULATOR component ..."
+print("[CALC] Get reference to CALCULATOR component ...")
 calculator = salome.lcc.FindOrLoadComponent("FactoryServer", "CALCULATOR")
-print "[CALC] ---"
+print("[CALC] ---")
 
 # Get a CORBA field proxy on the distant field (located in the med server)
-print "[CALC] Read field %s ..." % fieldName
+print("[CALC] Read field %s ..." % fieldName)
 f = ReadFieldCell(medFile, meshName, 0, fieldName, -1, -1)
 fieldcelldouble = MEDCouplingFieldDoubleServant._this(f)
 
-print "[CALC] -> fieldcelldouble is:"
-print f
-print f.getName()
-print f.getDescription()
-print f.getNumberOfComponents()
-print "[CALC] ---"
+print("[CALC] -> fieldcelldouble is:")
+print(f)
+print(f.getName())
+print(f.getDescription())
+print(f.getNumberOfComponents())
+print("[CALC] ---")
 
-print "[CALC] Clone field: fieldcelldoublevector -> f1,f2,f3,f4 ..."
+print("[CALC] Clone field: fieldcelldoublevector -> f1,f2,f3,f4 ...")
 (f1,f2,f3,f4) = calculator.cloneField(fieldcelldouble)
-print "[CALC] -> f1 is:"
+print("[CALC] -> f1 is:")
 calculator.printField(f1)
-print "[CALC] ---"
+print("[CALC] ---")
 
-print "[CALC] Add fields f2+f3 ..."
+print("[CALC] Add fields f2+f3 ...")
 f_add = calculator.add(f2, f3)
-print "[CALC] -> f_add is:"
+print("[CALC] -> f_add is:")
 calculator.printField(f_add)
-print "[CALC] ---"
+print("[CALC] ---")
 
-print "[CALC] Apply linear function to f4 ..."
+print("[CALC] Apply linear function to f4 ...")
 f_lin = calculator.applyLin(f4, 2.0, 1.0)
-print "[CALC] -> f_add is:"
+print("[CALC] -> f_add is:")
 calculator.printField(f_lin)
-print "[CALC] ---"
+print("[CALC] ---")
 
-print "[CALC] Apply Norm Max to f_lin ..."
+print("[CALC] Apply Norm Max to f_lin ...")
 norm = calculator.normMax(f_lin)
-print "[CALC] -> norm is ", norm
-print "[CALC] ---"
+print("[CALC] -> norm is ", norm)
+print("[CALC] ---")
 
-print "[CALC] Clone fields created by Calculator via client classes ..."
+print("[CALC] Clone fields created by Calculator via client classes ...")
 f_addLocal = MEDCouplingFieldDoubleClient.New(f_add)
 f_addLocal.setName(f_addLocal.getName() + "add")
 f_linLocal = MEDCouplingFieldDoubleClient.New(f_lin)
 f_linLocal.setName(f_linLocal.getName() + "lin")
-print "[CALC] -> f_addLocal is ", f_addLocal
-print "[CALC] -> f_linLocal is ", f_linLocal
-print "[CALC] ---"
+print("[CALC] -> f_addLocal is ", f_addLocal)
+print("[CALC] -> f_linLocal is ", f_linLocal)
+print("[CALC] ---")
 
-print "[CALC] Get information from the local copy of the distant mesh"
+print("[CALC] Get information from the local copy of the distant mesh")
 meshLocal = f_addLocal.getMesh()
-print "[CALC] -> meshLocal is", meshLocal
-print "[CALC] ---"
+print("[CALC] -> meshLocal is", meshLocal)
+print("[CALC] ---")
 
-print "[CALC] Write mesh and fields to MED file ..."
+print("[CALC] Write mesh and fields to MED file ...")
 import tempfile
 outfile = tempfile.NamedTemporaryFile(prefix="Calculator_pointe_", suffix=".med")
 outfile.close()
@@ -108,6 +108,6 @@ WriteUMesh(outfile.name, meshLocal, True)
 WriteFieldUsingAlreadyWrittenMesh(outfile.name, f_addLocal)
 WriteFieldUsingAlreadyWrittenMesh(outfile.name, f_linLocal)
 os.remove(outfile.name)
-print "[CALC] ---"
+print("[CALC] ---")
 
-print "[CALC] End of Calculator Test!"
+print("[CALC] End of Calculator Test!")