From 9c6af7fa973eb5d2ed36eb3d64390940d13fbd08 Mon Sep 17 00:00:00 2001 From: Gilles DAVID Date: Tue, 2 May 2017 19:01:44 +0200 Subject: [PATCH] =?utf8?q?[PY3]=20Fix=20appels=20=C3=A0=20print=20dans=20l?= =?utf8?q?es=20sch=C3=A9ma=20xml=20et=20scripts=20python?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- py-compile | 8 +++--- src/py2yacs/Test/Py2yacsTest.cxx | 2 +- src/pyqt/yacsfiles/forloop3.xml | 4 +-- src/pyqt/yacsfiles/while1.xml | 4 +-- src/salomeloader/samples/Graph_couronne.xml | 12 ++++----- src/salomeloader/samples/testvisu20.xml | 26 +++++++++---------- .../adm/unix/config_files/ac_python_devel.m4 | 2 +- .../adm/unix/config_files/check_python.m4 | 4 +-- .../adm_local/unix/config_files/python.m4 | 2 +- .../HXX2SALOME_GENERIC_CLASS_NAME_TEST.py | 4 +-- .../unix/config_files/check_python.m4 | 4 +-- .../adm_local/unix/py-compile | 8 +++--- .../HXX2SALOME_GENERIC_CLASS_NAME_TEST.py | 4 +-- src/yacsloader/Test/genPascal.py | 4 +-- src/yacsloader/Test/genTriangle.py | 2 +- src/yacsloader/samples/aschema.xml | 24 ++++++++--------- src/yacsloader/samples/bid.xml | 2 +- src/yacsloader/samples/bloc1.xml | 2 +- src/yacsloader/samples/bloc2.xml | 4 +-- src/yacsloader/samples/bloc3.xml | 2 +- src/yacsloader/samples/bloc4.xml | 4 +-- src/yacsloader/samples/bool1.xml | 4 +-- src/yacsloader/samples/cpp1.xml | 10 +++---- src/yacsloader/samples/datanode0.xml | 4 +-- src/yacsloader/samples/double1.xml | 4 +-- src/yacsloader/samples/err0.xml | 4 +-- src/yacsloader/samples/err1.xml | 4 +-- src/yacsloader/samples/err2.xml | 4 +-- src/yacsloader/samples/err3.xml | 8 +++--- src/yacsloader/samples/eschema.xml | 2 +- src/yacsloader/samples/file1.xml | 4 +-- src/yacsloader/samples/foreach1.xml | 6 ++--- src/yacsloader/samples/foreach2.xml | 6 ++--- src/yacsloader/samples/foreach3.xml | 6 ++--- src/yacsloader/samples/foreach4.xml | 2 +- src/yacsloader/samples/foreach5.xml | 4 +-- src/yacsloader/samples/foreach6.xml | 4 +-- src/yacsloader/samples/foreach7.xml | 2 +- src/yacsloader/samples/foreach_LongCorba.xml | 2 +- src/yacsloader/samples/foreach_LongPython.xml | 6 ++--- src/yacsloader/samples/foreach_init2fin.xml | 8 +++--- src/yacsloader/samples/forloop1.xml | 4 +-- src/yacsloader/samples/forloop2.xml | 4 +-- src/yacsloader/samples/forloop3.xml | 4 +-- src/yacsloader/samples/forloop4.xml | 4 +-- src/yacsloader/samples/forloop5.xml | 4 +-- src/yacsloader/samples/forloop6.xml | 4 +-- src/yacsloader/samples/forloop7.xml | 4 +-- src/yacsloader/samples/forwhile1.xml | 4 +-- src/yacsloader/samples/fschema.xml | 2 +- src/yacsloader/samples/gobj1.xml | 6 ++--- src/yacsloader/samples/integer1.xml | 4 +-- src/yacsloader/samples/legendre7.xml | 4 +-- src/yacsloader/samples/objref1.xml | 6 ++--- src/yacsloader/samples/objref2.xml | 4 +-- src/yacsloader/samples/optimizer1.xml | 2 +- src/yacsloader/samples/optimizer2.xml | 2 +- .../samples/optimizer_async_cpp.xml | 2 +- src/yacsloader/samples/optimizer_async_py.xml | 2 +- src/yacsloader/samples/optimizer_sync_cpp.xml | 2 +- src/yacsloader/samples/optimizer_sync_py.xml | 2 +- src/yacsloader/samples/pschema.xml | 22 ++++++++-------- src/yacsloader/samples/pyremote1.xml | 10 +++---- src/yacsloader/samples/pyremote2.xml | 12 ++++----- src/yacsloader/samples/pyremote3.xml | 8 +++--- src/yacsloader/samples/pyremote4.xml | 12 ++++----- src/yacsloader/samples/refcnt1.xml | 2 +- src/yacsloader/samples/schema2.xml | 22 ++++++++-------- src/yacsloader/samples/schemaANN2.xml | 10 +++---- src/yacsloader/samples/schemaANNLR2.xml | 10 +++---- src/yacsloader/samples/schemaLR2.xml | 10 +++---- .../samples/schemaPmmlDoesNotExist.xml | 10 +++---- src/yacsloader/samples/sinline1.xml | 24 ++++++++--------- src/yacsloader/samples/sinline2.xml | 6 ++--- src/yacsloader/samples/sinline3.xml | 6 ++--- src/yacsloader/samples/sinline4.xml | 24 ++++++++--------- src/yacsloader/samples/sinline5.xml | 8 +++--- src/yacsloader/samples/string1.xml | 4 +-- src/yacsloader/samples/struct1.xml | 12 ++++----- src/yacsloader/samples/study1.xml | 2 +- src/yacsloader/samples/switch1.xml | 6 ++--- src/yacsloader/samples/switch10.xml | 8 +++--- src/yacsloader/samples/switch2.xml | 6 ++--- src/yacsloader/samples/switch3.xml | 6 ++--- src/yacsloader/samples/switch4.xml | 8 +++--- src/yacsloader/samples/switch5.xml | 8 +++--- src/yacsloader/samples/switch6.xml | 8 +++--- src/yacsloader/samples/switch7.xml | 8 +++--- src/yacsloader/samples/switch8.xml | 8 +++--- src/yacsloader/samples/switch9.xml | 8 +++--- src/yacsloader/samples/triangle5error.xml | 4 +-- src/yacsloader/samples/while1.xml | 4 +-- src/yacsloader/samples/while2.xml | 4 +-- src/yacsloader/samples/while3.xml | 4 +-- src/yacsloader_swig/Test/testEdit.py | 16 ++++++------ src/yacsloader_swig/Test/testLoader.py | 6 ++--- src/yacsloader_swig/Test/testSaveLoadRun.py | 18 ++++++------- 97 files changed, 318 insertions(+), 318 deletions(-) diff --git a/py-compile b/py-compile index a055fae4f..12be85251 100755 --- a/py-compile +++ b/py-compile @@ -65,12 +65,12 @@ $PYTHON -c " import sys, os, string, py_compile files = '''$*''' -print 'Byte-compiling python modules...' +print('Byte-compiling python modules...') for file in string.split(files): $trans if not os.path.exists(path) or not (len(path) >= 3 and path[-3:] == '.py'): continue - print file, + print(file, end='') sys.stdout.flush() py_compile.compile(path) print" || exit $? @@ -80,12 +80,12 @@ $PYTHON -O -c " import sys, os, string, py_compile files = '''$*''' -print 'Byte-compiling python modules (optimised versions) ...' +print('Byte-compiling python modules (optimised versions) ...') for file in string.split(files): $trans if not os.path.exists(path) or not (len(path) >= 3 and path[-3:] == '.py'): continue - print file, + print(file, end='') sys.stdout.flush() py_compile.compile(path) print" 2>/dev/null || : diff --git a/src/py2yacs/Test/Py2yacsTest.cxx b/src/py2yacs/Test/Py2yacsTest.cxx index a86802431..835baf195 100644 --- a/src/py2yacs/Test/Py2yacsTest.cxx +++ b/src/py2yacs/Test/Py2yacsTest.cxx @@ -225,7 +225,7 @@ void Py2yacsTest::unaccepted_statement2() const char * code_py = "def f(a):\n" " return a\n" "if __name__ == '__main__':" - " print 'toto'\n"; + " print('toto')\n"; verifyWrongPycode(code_py, "f", "not accepted statement"); } diff --git a/src/pyqt/yacsfiles/forloop3.xml b/src/pyqt/yacsfiles/forloop3.xml index f2feb37b3..aaa98f565 100644 --- a/src/pyqt/yacsfiles/forloop3.xml +++ b/src/pyqt/yacsfiles/forloop3.xml @@ -35,9 +35,9 @@ def f(p1): global a p1= p1+10. - print a + print(a) a=a+p1 - print a + print(a) return p1 diff --git a/src/pyqt/yacsfiles/while1.xml b/src/pyqt/yacsfiles/while1.xml index 723751e76..917f8a543 100644 --- a/src/pyqt/yacsfiles/while1.xml +++ b/src/pyqt/yacsfiles/while1.xml @@ -37,9 +37,9 @@ def f(p1): global a p1= p1+10. - print a + print(a) a=a+p1 - print "p1:",p1 + print("p1:",p1) return p1,condition diff --git a/src/salomeloader/samples/Graph_couronne.xml b/src/salomeloader/samples/Graph_couronne.xml index da16e5775..16e2ea5fb 100644 --- a/src/salomeloader/samples/Graph_couronne.xml +++ b/src/salomeloader/samples/Graph_couronne.xml @@ -158,8 +158,8 @@ - - + + @@ -170,8 +170,8 @@ index : ]]> - - + + @@ -180,8 +180,8 @@ Next - - + + diff --git a/src/salomeloader/samples/testvisu20.xml b/src/salomeloader/samples/testvisu20.xml index 1721040a4..61f005ebb 100644 --- a/src/salomeloader/samples/testvisu20.xml +++ b/src/salomeloader/samples/testvisu20.xml @@ -119,19 +119,19 @@ - aVisu ", aVisu ]]> + aVisu ", aVisu) ]]> - aViewManager ", aViewManager ]]> + aViewManager ", aViewManager) ]]> - aView ", aView ]]> + aView ", aView) ]]> - myResult ", myResult ]]> + myResult ", myResult) ]]> 8/4/2005 - 14:3:47 @@ -203,7 +203,7 @@ - + @@ -214,7 +214,7 @@ - + @@ -223,7 +223,7 @@ - + @@ -336,24 +336,24 @@ - + - + - + - - + + - + diff --git a/src/wrappergen/bin/Cpp_Template__SRC/adm/unix/config_files/ac_python_devel.m4 b/src/wrappergen/bin/Cpp_Template__SRC/adm/unix/config_files/ac_python_devel.m4 index ddbcdd722..acff4fd67 100755 --- a/src/wrappergen/bin/Cpp_Template__SRC/adm/unix/config_files/ac_python_devel.m4 +++ b/src/wrappergen/bin/Cpp_Template__SRC/adm/unix/config_files/ac_python_devel.m4 @@ -70,7 +70,7 @@ AC_DEFUN([AC_PYTHON_DEVEL],[ AC_MSG_CHECKING(python extra libraries) PYTHON_EXTRA_LIBS=`$PYTHON -c "import distutils.sysconfig; \ conf = distutils.sysconfig.get_config_var; \ - print conf('LOCALMODLIBS')+' '+conf('LIBS')" + print(conf('LOCALMODLIBS')+' '+conf('LIBS'))" AC_MSG_RESULT($PYTHON_EXTRA_LIBS)` AC_SUBST(PYTHON_EXTRA_LIBS) ]) diff --git a/src/wrappergen/bin/Cpp_Template__SRC/adm/unix/config_files/check_python.m4 b/src/wrappergen/bin/Cpp_Template__SRC/adm/unix/config_files/check_python.m4 index 03e8b8f1c..8542a7e93 100644 --- a/src/wrappergen/bin/Cpp_Template__SRC/adm/unix/config_files/check_python.m4 +++ b/src/wrappergen/bin/Cpp_Template__SRC/adm/unix/config_files/check_python.m4 @@ -51,7 +51,7 @@ AC_DEFUN(CHECK_PYTHON, AC_SUBST(PYTHONHOME) changequote(<<, >>)dnl - PYTHON_VERSION=`$PYTHON -c "import sys; print sys.version[:3]"` + PYTHON_VERSION=`$PYTHON -c "import sys; print(sys.version[:3])"` changequote([, ])dnl AC_SUBST(PYTHON_VERSION) @@ -73,7 +73,7 @@ AC_DEFUN(CHECK_PYTHON, dnl to know which OS Python thinks this is. AC_SUBST(PYTHON_PLATFORM) - PYTHON_PLATFORM=`$PYTHON -c "import sys; print sys.platform"` + PYTHON_PLATFORM=`$PYTHON -c "import sys; print(sys.platform)"` AC_SUBST(PYTHON_SITE) AC_ARG_WITH(python-site, diff --git a/src/wrappergen/bin/HXX2SALOME_GENERIC_CLASS_NAME_SRC/adm_local/unix/config_files/python.m4 b/src/wrappergen/bin/HXX2SALOME_GENERIC_CLASS_NAME_SRC/adm_local/unix/config_files/python.m4 index 6e3eb3af9..a05241110 100644 --- a/src/wrappergen/bin/HXX2SALOME_GENERIC_CLASS_NAME_SRC/adm_local/unix/config_files/python.m4 +++ b/src/wrappergen/bin/HXX2SALOME_GENERIC_CLASS_NAME_SRC/adm_local/unix/config_files/python.m4 @@ -75,7 +75,7 @@ AC_DEFUN([CHECK_PYTHON],[ AC_MSG_CHECKING(python extra libraries) PYTHON_EXTRA_LIBS=`$PYTHON -c "import distutils.sysconfig; \ conf = distutils.sysconfig.get_config_var; \ - print conf('LOCALMODLIBS')+' '+conf('LIBS')" + print(conf('LOCALMODLIBS')+' '+conf('LIBS'))" AC_MSG_RESULT($PYTHON_EXTRA_LIBS)` AC_SUBST(PYTHON_EXTRA_LIBS) ]) diff --git a/src/wrappergen/bin/HXX2SALOME_GENERIC_CLASS_NAME_SRC/src/HXX2SALOME_GENERIC_CLASS_NAME/HXX2SALOME_GENERIC_CLASS_NAME_TEST.py b/src/wrappergen/bin/HXX2SALOME_GENERIC_CLASS_NAME_SRC/src/HXX2SALOME_GENERIC_CLASS_NAME/HXX2SALOME_GENERIC_CLASS_NAME_TEST.py index 336194cd2..9a54816e8 100755 --- a/src/wrappergen/bin/HXX2SALOME_GENERIC_CLASS_NAME_SRC/src/HXX2SALOME_GENERIC_CLASS_NAME/HXX2SALOME_GENERIC_CLASS_NAME_TEST.py +++ b/src/wrappergen/bin/HXX2SALOME_GENERIC_CLASS_NAME_SRC/src/HXX2SALOME_GENERIC_CLASS_NAME/HXX2SALOME_GENERIC_CLASS_NAME_TEST.py @@ -17,10 +17,10 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -mport salome +import salome import HXX2SALOME_GENERIC_CLASS_NAME_ORB myHXX2SALOME_GENERIC_CLASS_NAME = salome.lcc.FindOrLoadComponent("FactoryServer", "HXX2SALOME_GENERIC_CLASS_NAME") # # -print "Hello HXX2SALOME_GENERIC_CLASS_NAME" +print("Hello HXX2SALOME_GENERIC_CLASS_NAME") # Test here some of HXX2SALOME_GENERIC_CLASS_NAME methods ... diff --git a/src/wrappergen/src/HXX2SALOME_GENERIC_CLASS_NAME_SRC/adm_local/unix/config_files/check_python.m4 b/src/wrappergen/src/HXX2SALOME_GENERIC_CLASS_NAME_SRC/adm_local/unix/config_files/check_python.m4 index 5124e064d..e5d83bec9 100644 --- a/src/wrappergen/src/HXX2SALOME_GENERIC_CLASS_NAME_SRC/adm_local/unix/config_files/check_python.m4 +++ b/src/wrappergen/src/HXX2SALOME_GENERIC_CLASS_NAME_SRC/adm_local/unix/config_files/check_python.m4 @@ -56,7 +56,7 @@ AC_DEFUN([CHECK_PYTHON], AC_SUBST(PYTHONHOME) changequote(<<, >>)dnl - PYTHON_VERSION=`$PYTHON -c "import sys; print sys.version[:3]"` + PYTHON_VERSION=`$PYTHON -c "import sys; print(sys.version[:3])"` changequote([, ])dnl AC_SUBST(PYTHON_VERSION) @@ -79,7 +79,7 @@ AC_DEFUN([CHECK_PYTHON], dnl to know which OS Python thinks this is. AC_SUBST(PYTHON_PLATFORM) - PYTHON_PLATFORM=`$PYTHON -c "import sys; print sys.platform"` + PYTHON_PLATFORM=`$PYTHON -c "import sys; print(sys.platform)"` AC_SUBST(PYTHON_SITE) AC_ARG_WITH(python-site, diff --git a/src/wrappergen/src/HXX2SALOME_GENERIC_CLASS_NAME_SRC/adm_local/unix/py-compile b/src/wrappergen/src/HXX2SALOME_GENERIC_CLASS_NAME_SRC/adm_local/unix/py-compile index f5d4fdc58..301908db4 100755 --- a/src/wrappergen/src/HXX2SALOME_GENERIC_CLASS_NAME_SRC/adm_local/unix/py-compile +++ b/src/wrappergen/src/HXX2SALOME_GENERIC_CLASS_NAME_SRC/adm_local/unix/py-compile @@ -78,12 +78,12 @@ $PYTHON -c " import sys, os, string, py_compile files = '''$*''' -print 'Byte-compiling python modules...' +print('Byte-compiling python modules...') for file in string.split(files): $trans if not os.path.exists(path) or not (len(path) >= 3 and path[-3:] == '.py'): continue - print file, + print(file, end='') sys.stdout.flush() py_compile.compile(path) print" || exit $? @@ -93,12 +93,12 @@ $PYTHON -O -c " import sys, os, string, py_compile files = '''$*''' -print 'Byte-compiling python modules (optimized versions) ...' +print('Byte-compiling python modules (optimized versions) ...') for file in string.split(files): $trans if not os.path.exists(path) or not (len(path) >= 3 and path[-3:] == '.py'): continue - print file, + print(file, end='') sys.stdout.flush() py_compile.compile(path) print" 2>/dev/null || : diff --git a/src/wrappergen/src/HXX2SALOME_GENERIC_CLASS_NAME_SRC/src/HXX2SALOME_GENERIC_CLASS_NAME_I/HXX2SALOME_GENERIC_CLASS_NAME_TEST.py b/src/wrappergen/src/HXX2SALOME_GENERIC_CLASS_NAME_SRC/src/HXX2SALOME_GENERIC_CLASS_NAME_I/HXX2SALOME_GENERIC_CLASS_NAME_TEST.py index 336194cd2..9a54816e8 100755 --- a/src/wrappergen/src/HXX2SALOME_GENERIC_CLASS_NAME_SRC/src/HXX2SALOME_GENERIC_CLASS_NAME_I/HXX2SALOME_GENERIC_CLASS_NAME_TEST.py +++ b/src/wrappergen/src/HXX2SALOME_GENERIC_CLASS_NAME_SRC/src/HXX2SALOME_GENERIC_CLASS_NAME_I/HXX2SALOME_GENERIC_CLASS_NAME_TEST.py @@ -17,10 +17,10 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -mport salome +import salome import HXX2SALOME_GENERIC_CLASS_NAME_ORB myHXX2SALOME_GENERIC_CLASS_NAME = salome.lcc.FindOrLoadComponent("FactoryServer", "HXX2SALOME_GENERIC_CLASS_NAME") # # -print "Hello HXX2SALOME_GENERIC_CLASS_NAME" +print("Hello HXX2SALOME_GENERIC_CLASS_NAME") # Test here some of HXX2SALOME_GENERIC_CLASS_NAME methods ... diff --git a/src/yacsloader/Test/genPascal.py b/src/yacsloader/Test/genPascal.py index fa42edb0d..bf41ea19a 100644 --- a/src/yacsloader/Test/genPascal.py +++ b/src/yacsloader/Test/genPascal.py @@ -41,7 +41,7 @@ aa=Decimal(a) bb=Decimal(b) cc=aa+bb c=str(cc) -print "cc=",cc +print("cc=",cc) time.sleep(1) @@ -59,7 +59,7 @@ time.sleep(1) print("for i in range (" + str(n+1) + "):") print(" v='a' + str(i)") print(" tot+=Decimal(eval(v))") - print("print tot") + print("print(tot)") print("result=str(tot)") print("ref=Decimal(2)**" + str(n)) print("reference=str(ref)") diff --git a/src/yacsloader/Test/genTriangle.py b/src/yacsloader/Test/genTriangle.py index 4570fd13c..27df4d950 100644 --- a/src/yacsloader/Test/genTriangle.py +++ b/src/yacsloader/Test/genTriangle.py @@ -26,7 +26,7 @@ debut=""" diff --git a/src/yacsloader/samples/aschema.xml b/src/yacsloader/samples/aschema.xml index c57552a77..2da46f016 100644 --- a/src/yacsloader/samples/aschema.xml +++ b/src/yacsloader/samples/aschema.xml @@ -57,33 +57,33 @@ @@ -122,10 +122,10 @@ @@ -133,14 +133,14 @@ diff --git a/src/yacsloader/samples/bid.xml b/src/yacsloader/samples/bid.xml index ffe2cb572..ce964b515 100644 --- a/src/yacsloader/samples/bid.xml +++ b/src/yacsloader/samples/bid.xml @@ -43,7 +43,7 @@ def f(p1): - print p1;p1=2*p1 + print(p1);p1=2*p1 return p1 diff --git a/src/yacsloader/samples/bloc1.xml b/src/yacsloader/samples/bloc1.xml index a3bee62a3..e94491176 100644 --- a/src/yacsloader/samples/bloc1.xml +++ b/src/yacsloader/samples/bloc1.xml @@ -43,7 +43,7 @@ def f(p1): - print p1;p1=2*p1 + print(p1);p1=2*p1 return p1 diff --git a/src/yacsloader/samples/bloc2.xml b/src/yacsloader/samples/bloc2.xml index 52dcf1e8e..f2c161697 100644 --- a/src/yacsloader/samples/bloc2.xml +++ b/src/yacsloader/samples/bloc2.xml @@ -57,8 +57,8 @@ def f(p1): - print p1;p1=2*p1 - print "coucou b1.b2.node1" + print(p1);p1=2*p1 + print("coucou b1.b2.node1") return p1 diff --git a/src/yacsloader/samples/bloc3.xml b/src/yacsloader/samples/bloc3.xml index f399e2149..6ba9c0f1e 100644 --- a/src/yacsloader/samples/bloc3.xml +++ b/src/yacsloader/samples/bloc3.xml @@ -52,7 +52,7 @@ def f(p1): - print p1;p1=2*p1 + print(p1);p1=2*p1 return p1 diff --git a/src/yacsloader/samples/bloc4.xml b/src/yacsloader/samples/bloc4.xml index 403da740d..af5c48300 100644 --- a/src/yacsloader/samples/bloc4.xml +++ b/src/yacsloader/samples/bloc4.xml @@ -51,7 +51,7 @@ def f(s1): - print s1 + print(s1) return s1 @@ -61,7 +61,7 @@ def f(p1): - print p1;p1=2*p1 + print(p1);p1=2*p1 return p1 diff --git a/src/yacsloader/samples/bool1.xml b/src/yacsloader/samples/bool1.xml index 3b22aff59..fa9eb9889 100644 --- a/src/yacsloader/samples/bool1.xml +++ b/src/yacsloader/samples/bool1.xml @@ -125,7 +125,7 @@ @@ -146,7 +146,7 @@ diff --git a/src/yacsloader/samples/cpp1.xml b/src/yacsloader/samples/cpp1.xml index a876aac37..4c3fcf616 100644 --- a/src/yacsloader/samples/cpp1.xml +++ b/src/yacsloader/samples/cpp1.xml @@ -63,7 +63,7 @@ @@ -71,21 +71,21 @@ @@ -144,7 +144,7 @@ diff --git a/src/yacsloader/samples/datanode0.xml b/src/yacsloader/samples/datanode0.xml index d6969aee2..195b154ed 100644 --- a/src/yacsloader/samples/datanode0.xml +++ b/src/yacsloader/samples/datanode0.xml @@ -28,14 +28,14 @@ - + - + diff --git a/src/yacsloader/samples/double1.xml b/src/yacsloader/samples/double1.xml index f9e59bad6..78b723f65 100644 --- a/src/yacsloader/samples/double1.xml +++ b/src/yacsloader/samples/double1.xml @@ -125,7 +125,7 @@ @@ -146,7 +146,7 @@ diff --git a/src/yacsloader/samples/err0.xml b/src/yacsloader/samples/err0.xml index cd3d0ddcd..315ee6ad3 100644 --- a/src/yacsloader/samples/err0.xml +++ b/src/yacsloader/samples/err0.xml @@ -27,7 +27,7 @@ @@ -45,7 +45,7 @@ diff --git a/src/yacsloader/samples/err1.xml b/src/yacsloader/samples/err1.xml index 052eb3a2e..aac6b1dd9 100644 --- a/src/yacsloader/samples/err1.xml +++ b/src/yacsloader/samples/err1.xml @@ -28,7 +28,7 @@ @@ -46,7 +46,7 @@ diff --git a/src/yacsloader/samples/err2.xml b/src/yacsloader/samples/err2.xml index 9b6457f5a..cbe545edd 100644 --- a/src/yacsloader/samples/err2.xml +++ b/src/yacsloader/samples/err2.xml @@ -28,7 +28,7 @@ @@ -46,7 +46,7 @@ diff --git a/src/yacsloader/samples/err3.xml b/src/yacsloader/samples/err3.xml index 11da35a8b..aa6615787 100644 --- a/src/yacsloader/samples/err3.xml +++ b/src/yacsloader/samples/err3.xml @@ -31,7 +31,7 @@ @@ -39,21 +39,21 @@ - + - + - + diff --git a/src/yacsloader/samples/eschema.xml b/src/yacsloader/samples/eschema.xml index 1ea4b9fe1..a4d607c24 100644 --- a/src/yacsloader/samples/eschema.xml +++ b/src/yacsloader/samples/eschema.xml @@ -25,7 +25,7 @@ - + diff --git a/src/yacsloader/samples/file1.xml b/src/yacsloader/samples/file1.xml index b7edf0202..a96253974 100644 --- a/src/yacsloader/samples/file1.xml +++ b/src/yacsloader/samples/file1.xml @@ -31,7 +31,7 @@ @@ -56,7 +56,7 @@ diff --git a/src/yacsloader/samples/foreach1.xml b/src/yacsloader/samples/foreach1.xml index 76ba81a08..a67426a46 100644 --- a/src/yacsloader/samples/foreach1.xml +++ b/src/yacsloader/samples/foreach1.xml @@ -38,9 +38,9 @@ def f(p1): global a p1= p1+10. - print a + print(a) a=a+p1 - print a + print(a) return p1 @@ -49,7 +49,7 @@ diff --git a/src/yacsloader/samples/foreach2.xml b/src/yacsloader/samples/foreach2.xml index a3aded2e1..3032ba15d 100644 --- a/src/yacsloader/samples/foreach2.xml +++ b/src/yacsloader/samples/foreach2.xml @@ -39,9 +39,9 @@ def f(p1): global a p1= p1+10. - print a + print(a) a=a+p1 - print a + print(a) return p1 @@ -55,7 +55,7 @@ diff --git a/src/yacsloader/samples/foreach3.xml b/src/yacsloader/samples/foreach3.xml index 053d2fc04..372370018 100644 --- a/src/yacsloader/samples/foreach3.xml +++ b/src/yacsloader/samples/foreach3.xml @@ -38,9 +38,9 @@ def f(p1): global a p1= p1+10. - print a + print(a) a=a+p1 - print a + print(a) return p1 @@ -49,7 +49,7 @@ diff --git a/src/yacsloader/samples/foreach4.xml b/src/yacsloader/samples/foreach4.xml index 5979d101f..fcb5076a1 100644 --- a/src/yacsloader/samples/foreach4.xml +++ b/src/yacsloader/samples/foreach4.xml @@ -41,7 +41,7 @@ diff --git a/src/yacsloader/samples/foreach5.xml b/src/yacsloader/samples/foreach5.xml index f180683df..7474bad55 100644 --- a/src/yacsloader/samples/foreach5.xml +++ b/src/yacsloader/samples/foreach5.xml @@ -43,7 +43,7 @@ @@ -65,7 +65,7 @@ diff --git a/src/yacsloader/samples/foreach6.xml b/src/yacsloader/samples/foreach6.xml index 4ac15ad32..1d2706b8f 100644 --- a/src/yacsloader/samples/foreach6.xml +++ b/src/yacsloader/samples/foreach6.xml @@ -46,14 +46,14 @@ diff --git a/src/yacsloader/samples/foreach7.xml b/src/yacsloader/samples/foreach7.xml index b55285f86..721f09484 100644 --- a/src/yacsloader/samples/foreach7.xml +++ b/src/yacsloader/samples/foreach7.xml @@ -84,7 +84,7 @@ for run in range(numberOfRun): runs[run].append(medFile) runs[run].append(meshName) pass -print "There is(are) ",numberOfRun," runs of Fake Compo on process ",os.getpid() +print("There is(are) ",numberOfRun," runs of Fake Compo on process ",os.getpid()) ]]> diff --git a/src/yacsloader/samples/foreach_LongCorba.xml b/src/yacsloader/samples/foreach_LongCorba.xml index 63d600d66..873811842 100644 --- a/src/yacsloader/samples/foreach_LongCorba.xml +++ b/src/yacsloader/samples/foreach_LongCorba.xml @@ -41,7 +41,7 @@ diff --git a/src/yacsloader/samples/foreach_LongPython.xml b/src/yacsloader/samples/foreach_LongPython.xml index 8a378b6ca..e719e421a 100644 --- a/src/yacsloader/samples/foreach_LongPython.xml +++ b/src/yacsloader/samples/foreach_LongPython.xml @@ -36,9 +36,9 @@ import time def f(p1): - print "+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ start ", p1 + print("+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ start ", p1) time.sleep(0.1) - print "----------------------------------------- stop ", p1 + print("----------------------------------------- stop ", p1) return p1 @@ -47,7 +47,7 @@ diff --git a/src/yacsloader/samples/foreach_init2fin.xml b/src/yacsloader/samples/foreach_init2fin.xml index 42fcd80d5..fa3ed961c 100644 --- a/src/yacsloader/samples/foreach_init2fin.xml +++ b/src/yacsloader/samples/foreach_init2fin.xml @@ -33,7 +33,7 @@ - @@ -52,7 +52,7 @@ o1=7 - @@ -63,9 +63,9 @@ o1=7 - diff --git a/src/yacsloader/samples/forloop1.xml b/src/yacsloader/samples/forloop1.xml index b9b41e858..29544e31b 100644 --- a/src/yacsloader/samples/forloop1.xml +++ b/src/yacsloader/samples/forloop1.xml @@ -29,9 +29,9 @@ def f(p1): global a p1= p1+10. - print a + print(a) a=a+p1 - print a + print(a) return p1 diff --git a/src/yacsloader/samples/forloop2.xml b/src/yacsloader/samples/forloop2.xml index 86f441dfd..03d27fa66 100644 --- a/src/yacsloader/samples/forloop2.xml +++ b/src/yacsloader/samples/forloop2.xml @@ -29,9 +29,9 @@ def f(p1): global a p1= p1+10. - print "a=",a + print("a=",a) a=a+p1 - print "a=",a + print("a=",a) return p1 diff --git a/src/yacsloader/samples/forloop3.xml b/src/yacsloader/samples/forloop3.xml index 50082c8a3..de0ef11eb 100644 --- a/src/yacsloader/samples/forloop3.xml +++ b/src/yacsloader/samples/forloop3.xml @@ -35,9 +35,9 @@ def f(p1): global a p1= p1+10. - print a + print(a) a=a+p1 - print a + print(a) return p1 diff --git a/src/yacsloader/samples/forloop4.xml b/src/yacsloader/samples/forloop4.xml index a9be274ad..c648f4edd 100644 --- a/src/yacsloader/samples/forloop4.xml +++ b/src/yacsloader/samples/forloop4.xml @@ -36,9 +36,9 @@ def f(p1): global a p1= p1+10. - print a + print(a) a=a+p1 - print a + print(a) return p1 diff --git a/src/yacsloader/samples/forloop5.xml b/src/yacsloader/samples/forloop5.xml index 44329cc5f..4ab87aee9 100644 --- a/src/yacsloader/samples/forloop5.xml +++ b/src/yacsloader/samples/forloop5.xml @@ -37,9 +37,9 @@ def f(p1): global a p1= p1+10. - print a + print(a) a=a+p1 - print a + print(a) return p1 diff --git a/src/yacsloader/samples/forloop6.xml b/src/yacsloader/samples/forloop6.xml index 576a388ed..ca8f2d8d9 100644 --- a/src/yacsloader/samples/forloop6.xml +++ b/src/yacsloader/samples/forloop6.xml @@ -39,9 +39,9 @@ def f(p1): global a p1= p1+10. - print a + print(a) a=a+p1 - print a + print(a) return p1 diff --git a/src/yacsloader/samples/forloop7.xml b/src/yacsloader/samples/forloop7.xml index ad41800c8..49b778782 100644 --- a/src/yacsloader/samples/forloop7.xml +++ b/src/yacsloader/samples/forloop7.xml @@ -37,9 +37,9 @@ def f(p1): global a p1= p1+10. - print a + print(a) a=a+p1 - print a + print(a) return p1 diff --git a/src/yacsloader/samples/forwhile1.xml b/src/yacsloader/samples/forwhile1.xml index b773e39ba..0f57b9e84 100644 --- a/src/yacsloader/samples/forwhile1.xml +++ b/src/yacsloader/samples/forwhile1.xml @@ -41,9 +41,9 @@ def f(p1): global a p1= p1+10. - print "a:",a + print("a:",a) a=a+p1 - print "p1:",p1 + print("p1:",p1) return p1,condition diff --git a/src/yacsloader/samples/fschema.xml b/src/yacsloader/samples/fschema.xml index 541b14498..6361b4c4a 100644 --- a/src/yacsloader/samples/fschema.xml +++ b/src/yacsloader/samples/fschema.xml @@ -27,7 +27,7 @@ def f(p1): - print p1;p1=2*p1 + print(p1);p1=2*p1 return p1 diff --git a/src/yacsloader/samples/gobj1.xml b/src/yacsloader/samples/gobj1.xml index b5b43155e..0edbd46a6 100644 --- a/src/yacsloader/samples/gobj1.xml +++ b/src/yacsloader/samples/gobj1.xml @@ -56,7 +56,7 @@ @@ -91,7 +91,7 @@ @@ -100,7 +100,7 @@ diff --git a/src/yacsloader/samples/integer1.xml b/src/yacsloader/samples/integer1.xml index 3d140bb8b..44e5b412c 100644 --- a/src/yacsloader/samples/integer1.xml +++ b/src/yacsloader/samples/integer1.xml @@ -125,7 +125,7 @@ @@ -146,7 +146,7 @@ diff --git a/src/yacsloader/samples/legendre7.xml b/src/yacsloader/samples/legendre7.xml index a17139555..ffff333b4 100644 --- a/src/yacsloader/samples/legendre7.xml +++ b/src/yacsloader/samples/legendre7.xml @@ -35,7 +35,7 @@ @@ -73,7 +73,7 @@ diff --git a/src/yacsloader/samples/objref1.xml b/src/yacsloader/samples/objref1.xml index 54842966a..2fde8b6cd 100644 --- a/src/yacsloader/samples/objref1.xml +++ b/src/yacsloader/samples/objref1.xml @@ -64,7 +64,7 @@ @@ -96,7 +96,7 @@ @@ -105,7 +105,7 @@ diff --git a/src/yacsloader/samples/objref2.xml b/src/yacsloader/samples/objref2.xml index 6339bdac8..3257ec35b 100644 --- a/src/yacsloader/samples/objref2.xml +++ b/src/yacsloader/samples/objref2.xml @@ -43,8 +43,8 @@ diff --git a/src/yacsloader/samples/optimizer1.xml b/src/yacsloader/samples/optimizer1.xml index 3beb702e4..b739870d1 100644 --- a/src/yacsloader/samples/optimizer1.xml +++ b/src/yacsloader/samples/optimizer1.xml @@ -27,7 +27,7 @@ diff --git a/src/yacsloader/samples/optimizer2.xml b/src/yacsloader/samples/optimizer2.xml index 1fd8d295e..928a0f713 100644 --- a/src/yacsloader/samples/optimizer2.xml +++ b/src/yacsloader/samples/optimizer2.xml @@ -28,7 +28,7 @@ diff --git a/src/yacsloader/samples/optimizer_async_cpp.xml b/src/yacsloader/samples/optimizer_async_cpp.xml index 6a2c69570..b47d16aee 100644 --- a/src/yacsloader/samples/optimizer_async_cpp.xml +++ b/src/yacsloader/samples/optimizer_async_cpp.xml @@ -50,7 +50,7 @@ diff --git a/src/yacsloader/samples/optimizer_async_py.xml b/src/yacsloader/samples/optimizer_async_py.xml index 96d324dac..84a4627a4 100644 --- a/src/yacsloader/samples/optimizer_async_py.xml +++ b/src/yacsloader/samples/optimizer_async_py.xml @@ -50,7 +50,7 @@ diff --git a/src/yacsloader/samples/optimizer_sync_cpp.xml b/src/yacsloader/samples/optimizer_sync_cpp.xml index e885f2e8d..85a447ccf 100644 --- a/src/yacsloader/samples/optimizer_sync_cpp.xml +++ b/src/yacsloader/samples/optimizer_sync_cpp.xml @@ -50,7 +50,7 @@ diff --git a/src/yacsloader/samples/optimizer_sync_py.xml b/src/yacsloader/samples/optimizer_sync_py.xml index abcaaa8ca..0cdcb4cb7 100644 --- a/src/yacsloader/samples/optimizer_sync_py.xml +++ b/src/yacsloader/samples/optimizer_sync_py.xml @@ -50,7 +50,7 @@ diff --git a/src/yacsloader/samples/pschema.xml b/src/yacsloader/samples/pschema.xml index 6e2439742..33ee7856c 100644 --- a/src/yacsloader/samples/pschema.xml +++ b/src/yacsloader/samples/pschema.xml @@ -54,27 +54,27 @@ @@ -112,10 +112,10 @@ @@ -123,14 +123,14 @@ diff --git a/src/yacsloader/samples/pyremote1.xml b/src/yacsloader/samples/pyremote1.xml index 42f5cf117..dbffbf097 100644 --- a/src/yacsloader/samples/pyremote1.xml +++ b/src/yacsloader/samples/pyremote1.xml @@ -44,9 +44,9 @@ @@ -58,8 +58,8 @@ def ff2(x,a): diff --git a/src/yacsloader/samples/pyremote2.xml b/src/yacsloader/samples/pyremote2.xml index 07b226505..77c10f701 100644 --- a/src/yacsloader/samples/pyremote2.xml +++ b/src/yacsloader/samples/pyremote2.xml @@ -47,9 +47,9 @@ @@ -60,9 +60,9 @@ def f(): diff --git a/src/yacsloader/samples/pyremote3.xml b/src/yacsloader/samples/pyremote3.xml index 5bb90f242..dd7c99e0c 100644 --- a/src/yacsloader/samples/pyremote3.xml +++ b/src/yacsloader/samples/pyremote3.xml @@ -47,10 +47,10 @@ diff --git a/src/yacsloader/samples/pyremote4.xml b/src/yacsloader/samples/pyremote4.xml index 9697dc6d5..e61f74e8d 100644 --- a/src/yacsloader/samples/pyremote4.xml +++ b/src/yacsloader/samples/pyremote4.xml @@ -43,12 +43,12 @@ @@ -59,8 +59,8 @@ print y,z diff --git a/src/yacsloader/samples/refcnt1.xml b/src/yacsloader/samples/refcnt1.xml index f46c0552f..9895ab4ca 100644 --- a/src/yacsloader/samples/refcnt1.xml +++ b/src/yacsloader/samples/refcnt1.xml @@ -28,7 +28,7 @@ def f(p1): global a a=a+1 - print a + print(a) return p1 diff --git a/src/yacsloader/samples/schema2.xml b/src/yacsloader/samples/schema2.xml index c0c148995..c9115ed71 100644 --- a/src/yacsloader/samples/schema2.xml +++ b/src/yacsloader/samples/schema2.xml @@ -57,27 +57,27 @@ @@ -115,10 +115,10 @@ @@ -126,14 +126,14 @@ diff --git a/src/yacsloader/samples/schemaANN2.xml b/src/yacsloader/samples/schemaANN2.xml index 27551ccf9..9d748ef02 100644 --- a/src/yacsloader/samples/schemaANN2.xml +++ b/src/yacsloader/samples/schemaANN2.xml @@ -60,10 +60,10 @@ if err > epsilon : msg += "refOutput - output : %f - %f \n"%(refOutput, output); msg += "Got abs relative diff %f .\n"%err ret = False; - print msg; + print(msg) pass -#print "+++ OK " , i , " +++", ret +#print("+++ OK " , i , " +++", ret) ]]> @@ -262,7 +262,7 @@ refOutputs = [ - @@ -402,7 +402,7 @@ refOutputs_LR = [ - @@ -264,7 +264,7 @@ refOutputs = [ - @@ -262,7 +262,7 @@ refOutputs = [ - diff --git a/src/yacsloader/samples/string1.xml b/src/yacsloader/samples/string1.xml index 83320d816..957db012f 100644 --- a/src/yacsloader/samples/string1.xml +++ b/src/yacsloader/samples/string1.xml @@ -125,7 +125,7 @@ @@ -146,7 +146,7 @@ diff --git a/src/yacsloader/samples/struct1.xml b/src/yacsloader/samples/struct1.xml index a50dbe553..b1406a174 100644 --- a/src/yacsloader/samples/struct1.xml +++ b/src/yacsloader/samples/struct1.xml @@ -64,14 +64,14 @@ @@ -92,15 +92,15 @@ @@ -125,7 +125,7 @@ diff --git a/src/yacsloader/samples/study1.xml b/src/yacsloader/samples/study1.xml index 37124851f..581695549 100644 --- a/src/yacsloader/samples/study1.xml +++ b/src/yacsloader/samples/study1.xml @@ -38,7 +38,7 @@ diff --git a/src/yacsloader/samples/switch1.xml b/src/yacsloader/samples/switch1.xml index 97d961048..95b618414 100644 --- a/src/yacsloader/samples/switch1.xml +++ b/src/yacsloader/samples/switch1.xml @@ -26,21 +26,21 @@ - + - + - + diff --git a/src/yacsloader/samples/switch10.xml b/src/yacsloader/samples/switch10.xml index 422f33a52..e637eeece 100644 --- a/src/yacsloader/samples/switch10.xml +++ b/src/yacsloader/samples/switch10.xml @@ -43,21 +43,21 @@ - + - + - + @@ -74,7 +74,7 @@ condition=p1 < 40. ]]> - diff --git a/src/yacsloader/samples/switch2.xml b/src/yacsloader/samples/switch2.xml index 629c91826..e33a13eb7 100644 --- a/src/yacsloader/samples/switch2.xml +++ b/src/yacsloader/samples/switch2.xml @@ -26,21 +26,21 @@ - + - + - + diff --git a/src/yacsloader/samples/switch3.xml b/src/yacsloader/samples/switch3.xml index f3041938f..484f2f0c3 100644 --- a/src/yacsloader/samples/switch3.xml +++ b/src/yacsloader/samples/switch3.xml @@ -32,21 +32,21 @@ - + - + - + diff --git a/src/yacsloader/samples/switch4.xml b/src/yacsloader/samples/switch4.xml index 7487c6aa9..3b5e570d8 100644 --- a/src/yacsloader/samples/switch4.xml +++ b/src/yacsloader/samples/switch4.xml @@ -32,7 +32,7 @@ @@ -40,21 +40,21 @@ - + - + - + diff --git a/src/yacsloader/samples/switch5.xml b/src/yacsloader/samples/switch5.xml index 653088bab..5657b2a7c 100644 --- a/src/yacsloader/samples/switch5.xml +++ b/src/yacsloader/samples/switch5.xml @@ -32,7 +32,7 @@ @@ -40,7 +40,7 @@ - + @@ -48,7 +48,7 @@ - + @@ -56,7 +56,7 @@ - + diff --git a/src/yacsloader/samples/switch6.xml b/src/yacsloader/samples/switch6.xml index 047a06cdd..2b72525ca 100644 --- a/src/yacsloader/samples/switch6.xml +++ b/src/yacsloader/samples/switch6.xml @@ -31,7 +31,7 @@ @@ -40,21 +40,21 @@ - + - + - + diff --git a/src/yacsloader/samples/switch7.xml b/src/yacsloader/samples/switch7.xml index 253920014..4076df069 100644 --- a/src/yacsloader/samples/switch7.xml +++ b/src/yacsloader/samples/switch7.xml @@ -31,7 +31,7 @@ @@ -39,7 +39,7 @@ - + @@ -47,7 +47,7 @@ - + @@ -55,7 +55,7 @@ - + diff --git a/src/yacsloader/samples/switch8.xml b/src/yacsloader/samples/switch8.xml index 7948c4873..249c3840e 100644 --- a/src/yacsloader/samples/switch8.xml +++ b/src/yacsloader/samples/switch8.xml @@ -31,7 +31,7 @@ @@ -39,7 +39,7 @@ - + @@ -48,7 +48,7 @@ @@ -64,7 +64,7 @@ - + diff --git a/src/yacsloader/samples/switch9.xml b/src/yacsloader/samples/switch9.xml index 22739275c..8471859bb 100644 --- a/src/yacsloader/samples/switch9.xml +++ b/src/yacsloader/samples/switch9.xml @@ -29,7 +29,7 @@ @@ -37,7 +37,7 @@ - + @@ -47,7 +47,7 @@ @@ -70,7 +70,7 @@ - + diff --git a/src/yacsloader/samples/triangle5error.xml b/src/yacsloader/samples/triangle5error.xml index 0babd48d6..8d1658b5f 100644 --- a/src/yacsloader/samples/triangle5error.xml +++ b/src/yacsloader/samples/triangle5error.xml @@ -26,7 +26,7 @@ @@ -43,7 +43,7 @@ print c diff --git a/src/yacsloader/samples/while1.xml b/src/yacsloader/samples/while1.xml index 723751e76..917f8a543 100644 --- a/src/yacsloader/samples/while1.xml +++ b/src/yacsloader/samples/while1.xml @@ -37,9 +37,9 @@ def f(p1): global a p1= p1+10. - print a + print(a) a=a+p1 - print "p1:",p1 + print("p1:",p1) return p1,condition diff --git a/src/yacsloader/samples/while2.xml b/src/yacsloader/samples/while2.xml index 8500a93af..ce6947c19 100644 --- a/src/yacsloader/samples/while2.xml +++ b/src/yacsloader/samples/while2.xml @@ -38,9 +38,9 @@ - + - + diff --git a/src/yacsloader/samples/while3.xml b/src/yacsloader/samples/while3.xml index bc48f23f5..b4c6b17c2 100644 --- a/src/yacsloader/samples/while3.xml +++ b/src/yacsloader/samples/while3.xml @@ -38,9 +38,9 @@ def f(p1): global a p1= p1+10. - print a + print(a) a=a+p1 - print "p1:",p1 + print("p1:",p1) return p1,condition diff --git a/src/yacsloader_swig/Test/testEdit.py b/src/yacsloader_swig/Test/testEdit.py index c9f8d1b49..a3fc8aa4d 100755 --- a/src/yacsloader_swig/Test/testEdit.py +++ b/src/yacsloader_swig/Test/testEdit.py @@ -60,7 +60,7 @@ class TestEdit(unittest.TestCase): print(tc3.isAdaptable(tc5),1) n=self.r.createScriptNode("","node1") - n.setScript("print 'coucou1'") + n.setScript("print('coucou1')") n.edAddInputPort("p1",ti) n.edAddOutputPort("p1",ti) p.edAddChild(n) @@ -79,7 +79,7 @@ class TestEdit(unittest.TestCase): # --- create script node node2 n2=self.r.createScriptNode("","node2") - n2.setScript("print 'coucou2'") + n2.setScript("print('coucou2')") n2.edAddInputPort("p1",ti) p.edAddChild(n2) # --- end of node @@ -95,7 +95,7 @@ class TestEdit(unittest.TestCase): n=self.r.createFuncNode("","node3") n.setScript(""" def f(): - print 'coucou3' + print('coucou3') """) n.setFname("f") p.edAddChild(n) @@ -126,7 +126,7 @@ class TestEdit(unittest.TestCase): p.edAddChild(b) n=self.r.createScriptNode("","b1.node2") - n.setScript("print 'coucou2'") + n.setScript("print('coucou2')") b.edAddChild(n) # --- end bloc @@ -137,7 +137,7 @@ class TestEdit(unittest.TestCase): ip.edInitInt(3) n=self.r.createScriptNode("","l1.node2") - n.setScript("print 'coucou2'") + n.setScript("print('coucou2')") lo.edSetNode(n) # --- end loop @@ -151,7 +151,7 @@ class TestEdit(unittest.TestCase): n=self.r.createFuncNode("","w1.node3") n.setScript(""" def f(): - print 'coucou3' + print('coucou3') return 0 """) n.setFname("f") @@ -168,7 +168,7 @@ def f(): n=self.r.createFuncNode("","sw1.node3") n.setScript(""" def f(): - print 'case1' + print('case1') return 0 """) n.setFname("f") @@ -177,7 +177,7 @@ def f(): n=self.r.createFuncNode("","sw1.node4") n.setScript(""" def f(): - print 'default' + print('default') return 0 """) n.setFname("f") diff --git a/src/yacsloader_swig/Test/testLoader.py b/src/yacsloader_swig/Test/testLoader.py index 5264c98e5..0083871b6 100755 --- a/src/yacsloader_swig/Test/testLoader.py +++ b/src/yacsloader_swig/Test/testLoader.py @@ -44,8 +44,8 @@ class TestLoader(unittest.TestCase): except IOError as ex: print("IO Error: ", ex) retex=ex - #except pilot.invalid_argument,ex: - # print "invalid_argument:",ex.what() + # except pilot.invalid_argument as ex: + # print("invalid_argument:",str(ex)) # retex=ex.what() self.assertTrue(retex is not None, "exception not raised, or wrong type") pass @@ -90,4 +90,4 @@ if __name__ == '__main__': suite = unittest.makeSuite(TestLoader) result=unittest.TextTestRunner(f, descriptions=1, verbosity=1).run(suite) f.close() - sys.exit(not result.wasSuccessful()) \ No newline at end of file + sys.exit(not result.wasSuccessful()) diff --git a/src/yacsloader_swig/Test/testSaveLoadRun.py b/src/yacsloader_swig/Test/testSaveLoadRun.py index 86a710316..6bb2be7cb 100755 --- a/src/yacsloader_swig/Test/testSaveLoadRun.py +++ b/src/yacsloader_swig/Test/testSaveLoadRun.py @@ -56,7 +56,7 @@ def ff(nb,dbg): t+=1.+cos(1.*(x*3.14159)) pass pass - print "coucou from script0-%i -> %s"%(dbg,str(datetime.datetime.now()-ref)) + print("coucou from script0-%i -> %s"%(dbg,str(datetime.datetime.now()-ref))) return t """ script1=""" @@ -69,7 +69,7 @@ for i in xrange(i1): x=j*pas o2+=1.+cos(1.*(x*3.14159)) pass -print "coucou from script1-%i -> %s"%(dbg,str(datetime.datetime.now()-ref)) +print("coucou from script1-%i -> %s"%(dbg,str(datetime.datetime.now()-ref))) """ for i in range(nbOfNodes): node0=self.r.createFuncNode("DistPython","node%i"%(i)) @@ -150,7 +150,7 @@ def ff(nb,dbg): t+=1.+cos(1.*(x*3.14159)) pass pass - print "coucou from script0-%i -> %s"%(dbg,str(datetime.datetime.now()-ref)) + print("coucou from script0-%i -> %s"%(dbg,str(datetime.datetime.now()-ref))) return t """ # here in script1 aa is refered ! aa will exist thanks to HPCont Init Script @@ -164,7 +164,7 @@ for i in xrange(i1): x=j*pas o2+=1.+cos(1.*(x*3.14159)) pass -print "coucou %lf from script1-%i -> %s"%(aa,dbg,str(datetime.datetime.now()-ref)) +print("coucou %lf from script1-%i -> %s"%(aa,dbg,str(datetime.datetime.now()-ref))) aa+=1. """ # @@ -216,7 +216,7 @@ aa+=1. """ Test on HP Containers in foreach context.""" script0="""def ff(): global aa - print "%%lf - %%s"%%(aa,str(my_container)) + print("%%lf - %%s"%%(aa,str(my_container))) return 16*[%i],0 """ script1="""from math import cos @@ -228,7 +228,7 @@ for i in xrange(i1): x=j*pas o2+=1.+cos(1.*(x*3.14159)) pass -print "coucou %lf from script -> %s"%(aa,str(datetime.datetime.now()-ref)) +print("coucou %lf from script -> %s"%(aa,str(datetime.datetime.now()-ref))) aa+=1. o3=0 """ @@ -313,7 +313,7 @@ o3=0 """ Test that focuses on parallel load of containers.""" script0="""def ff(): global aa - print "%%lf - %%s"%%(aa,str(my_container)) + print("%%lf - %%s"%%(aa,str(my_container))) return 100*[%i],0 """ script1="""from math import cos @@ -325,7 +325,7 @@ for i in xrange(i1): x=j*pas o2+=1.+cos(1.*(x*3.14159)) pass -print "coucou %lf from script -> %s"%(aa,str(datetime.datetime.now()-ref)) +print("coucou %lf from script -> %s"%(aa,str(datetime.datetime.now()-ref))) aa+=1. o3=0 """ @@ -1157,7 +1157,7 @@ for i in i8: node00.edAddChild(node000_1) i7=node000_1.edAddInputPort("i7",ti2) i5=node000_1.edAddInputPort("i5",ti2) - node000_1.setScript("for i in i7:\n print i\nprint \"separation\"\nfor i in i5:\n print i") + node000_1.setScript("for i in i7:\n print(i)\nprint(\"separation\")\nfor i in i5:\n print(i)") node000_1.setContainer(cont) node000_1.setExecutionMode("remote") p.edAddLink(o5,i7) -- 2.39.2