From c55aed500073aeb618242cf87a86c5f96e125bc5 Mon Sep 17 00:00:00 2001 From: rnv Date: Thu, 31 Jan 2019 13:09:06 +0300 Subject: [PATCH] Fix for "23669: [CEA 13186] YACS xml scheme files with calls to print function need to be upgraded" issue. --- Yacs/Schemas/aschema.xml | 24 ++++++++++++------------ Yacs/Schemas/bid.xml | 2 +- Yacs/Schemas/bloc1.xml | 2 +- Yacs/Schemas/bloc2.xml | 4 ++-- Yacs/Schemas/bloc3.xml | 2 +- Yacs/Schemas/bloc4.xml | 4 ++-- Yacs/Schemas/bool1.xml | 4 ++-- Yacs/Schemas/cpp1.xml | 10 +++++----- Yacs/Schemas/datanode0.xml | 4 ++-- Yacs/Schemas/double1.xml | 4 ++-- Yacs/Schemas/err0.xml | 4 ++-- Yacs/Schemas/err1.xml | 4 ++-- Yacs/Schemas/err2.xml | 4 ++-- Yacs/Schemas/err3.xml | 8 ++++---- Yacs/Schemas/eschema.xml | 2 +- Yacs/Schemas/file1.xml | 4 ++-- Yacs/Schemas/foreach1.xml | 6 +++--- Yacs/Schemas/foreach2.xml | 6 +++--- Yacs/Schemas/foreach3.xml | 6 +++--- Yacs/Schemas/foreach4.xml | 2 +- Yacs/Schemas/foreach5.xml | 4 ++-- Yacs/Schemas/foreach6.xml | 4 ++-- Yacs/Schemas/foreach_LongCorba.xml | 2 +- Yacs/Schemas/foreach_LongPython.xml | 6 +++--- Yacs/Schemas/forloop1.xml | 4 ++-- Yacs/Schemas/forloop2.xml | 4 ++-- Yacs/Schemas/forloop3.xml | 4 ++-- Yacs/Schemas/forloop4.xml | 4 ++-- Yacs/Schemas/forloop5.xml | 4 ++-- Yacs/Schemas/forloop6.xml | 4 ++-- Yacs/Schemas/forloop7.xml | 4 ++-- Yacs/Schemas/forwhile1.xml | 4 ++-- Yacs/Schemas/fschema.xml | 2 +- Yacs/Schemas/gobj1.xml | 6 +++--- Yacs/Schemas/integer1.xml | 4 ++-- Yacs/Schemas/legendre7.xml | 4 ++-- Yacs/Schemas/objref1.xml | 6 +++--- Yacs/Schemas/objref2.xml | 4 ++-- Yacs/Schemas/optimizer1.xml | 2 +- Yacs/Schemas/optimizer2.xml | 2 +- Yacs/Schemas/pschema.xml | 22 +++++++++++----------- Yacs/Schemas/refcnt1.xml | 2 +- Yacs/Schemas/schema2.xml | 22 +++++++++++----------- Yacs/Schemas/sinline1.xml | 24 ++++++++++++------------ Yacs/Schemas/sinline2.xml | 6 +++--- Yacs/Schemas/sinline3.xml | 6 +++--- Yacs/Schemas/sinline4.xml | 24 ++++++++++++------------ Yacs/Schemas/sinline5.xml | 8 ++++---- Yacs/Schemas/string1.xml | 4 ++-- Yacs/Schemas/struct1.xml | 12 ++++++------ Yacs/Schemas/study1.xml | 2 +- Yacs/Schemas/switch1.xml | 6 +++--- Yacs/Schemas/switch2.xml | 6 +++--- Yacs/Schemas/switch3.xml | 6 +++--- Yacs/Schemas/switch4.xml | 8 ++++---- Yacs/Schemas/switch5.xml | 8 ++++---- Yacs/Schemas/switch6.xml | 8 ++++---- Yacs/Schemas/switch7.xml | 8 ++++---- Yacs/Schemas/switch8.xml | 8 ++++---- Yacs/Schemas/switch9.xml | 8 ++++---- Yacs/Schemas/triangle5error.xml | 4 ++-- Yacs/Schemas/while1.xml | 4 ++-- Yacs/Schemas/while2.xml | 4 ++-- Yacs/Schemas/while3.xml | 4 ++-- 64 files changed, 199 insertions(+), 199 deletions(-) diff --git a/Yacs/Schemas/aschema.xml b/Yacs/Schemas/aschema.xml index 72261e3..09d9e7f 100644 --- a/Yacs/Schemas/aschema.xml +++ b/Yacs/Schemas/aschema.xml @@ -57,33 +57,33 @@ @@ -122,10 +122,10 @@ @@ -133,14 +133,14 @@ diff --git a/Yacs/Schemas/bid.xml b/Yacs/Schemas/bid.xml index a79d50a..c76d409 100644 --- a/Yacs/Schemas/bid.xml +++ b/Yacs/Schemas/bid.xml @@ -43,7 +43,7 @@ def f(p1): - print p1;p1=2*p1 + print(p1);p1=2*p1 return p1 diff --git a/Yacs/Schemas/bloc1.xml b/Yacs/Schemas/bloc1.xml index dd2a0d4..72ea607 100644 --- a/Yacs/Schemas/bloc1.xml +++ b/Yacs/Schemas/bloc1.xml @@ -43,7 +43,7 @@ def f(p1): - print p1;p1=2*p1 + print(p1);p1=2*p1 return p1 diff --git a/Yacs/Schemas/bloc2.xml b/Yacs/Schemas/bloc2.xml index f24cc99..17f01fe 100644 --- a/Yacs/Schemas/bloc2.xml +++ b/Yacs/Schemas/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/Yacs/Schemas/bloc3.xml b/Yacs/Schemas/bloc3.xml index 68e0d55..ad1038b 100644 --- a/Yacs/Schemas/bloc3.xml +++ b/Yacs/Schemas/bloc3.xml @@ -52,7 +52,7 @@ def f(p1): - print p1;p1=2*p1 + print(p1);p1=2*p1 return p1 diff --git a/Yacs/Schemas/bloc4.xml b/Yacs/Schemas/bloc4.xml index 77ed2cf..293a874 100644 --- a/Yacs/Schemas/bloc4.xml +++ b/Yacs/Schemas/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/Yacs/Schemas/bool1.xml b/Yacs/Schemas/bool1.xml index 4e94b33..c99e934 100644 --- a/Yacs/Schemas/bool1.xml +++ b/Yacs/Schemas/bool1.xml @@ -125,7 +125,7 @@ @@ -146,7 +146,7 @@ diff --git a/Yacs/Schemas/cpp1.xml b/Yacs/Schemas/cpp1.xml index bf46fe1..04bfb4b 100644 --- a/Yacs/Schemas/cpp1.xml +++ b/Yacs/Schemas/cpp1.xml @@ -63,7 +63,7 @@ @@ -71,21 +71,21 @@ @@ -144,7 +144,7 @@ diff --git a/Yacs/Schemas/datanode0.xml b/Yacs/Schemas/datanode0.xml index ad0ad7c..e628bd6 100644 --- a/Yacs/Schemas/datanode0.xml +++ b/Yacs/Schemas/datanode0.xml @@ -28,14 +28,14 @@ - + - + diff --git a/Yacs/Schemas/double1.xml b/Yacs/Schemas/double1.xml index c836806..1fce924 100644 --- a/Yacs/Schemas/double1.xml +++ b/Yacs/Schemas/double1.xml @@ -125,7 +125,7 @@ @@ -146,7 +146,7 @@ diff --git a/Yacs/Schemas/err0.xml b/Yacs/Schemas/err0.xml index 899eff0..14a73b3 100644 --- a/Yacs/Schemas/err0.xml +++ b/Yacs/Schemas/err0.xml @@ -27,7 +27,7 @@ @@ -45,7 +45,7 @@ diff --git a/Yacs/Schemas/err1.xml b/Yacs/Schemas/err1.xml index 7c4d37d..2d93458 100644 --- a/Yacs/Schemas/err1.xml +++ b/Yacs/Schemas/err1.xml @@ -28,7 +28,7 @@ @@ -46,7 +46,7 @@ diff --git a/Yacs/Schemas/err2.xml b/Yacs/Schemas/err2.xml index 08cc1ff..1a5a278 100644 --- a/Yacs/Schemas/err2.xml +++ b/Yacs/Schemas/err2.xml @@ -28,7 +28,7 @@ @@ -46,7 +46,7 @@ diff --git a/Yacs/Schemas/err3.xml b/Yacs/Schemas/err3.xml index 6264043..5f478e2 100644 --- a/Yacs/Schemas/err3.xml +++ b/Yacs/Schemas/err3.xml @@ -31,7 +31,7 @@ @@ -39,21 +39,21 @@ - + - + - + diff --git a/Yacs/Schemas/eschema.xml b/Yacs/Schemas/eschema.xml index ad08ce4..084b646 100644 --- a/Yacs/Schemas/eschema.xml +++ b/Yacs/Schemas/eschema.xml @@ -25,7 +25,7 @@ - + diff --git a/Yacs/Schemas/file1.xml b/Yacs/Schemas/file1.xml index 87bcd3f..883eaa6 100644 --- a/Yacs/Schemas/file1.xml +++ b/Yacs/Schemas/file1.xml @@ -31,7 +31,7 @@ @@ -56,7 +56,7 @@ diff --git a/Yacs/Schemas/foreach1.xml b/Yacs/Schemas/foreach1.xml index 4b10780..c1505e9 100644 --- a/Yacs/Schemas/foreach1.xml +++ b/Yacs/Schemas/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/Yacs/Schemas/foreach2.xml b/Yacs/Schemas/foreach2.xml index 33df77f..7f114cd 100644 --- a/Yacs/Schemas/foreach2.xml +++ b/Yacs/Schemas/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/Yacs/Schemas/foreach3.xml b/Yacs/Schemas/foreach3.xml index 5664ea2..779446a 100644 --- a/Yacs/Schemas/foreach3.xml +++ b/Yacs/Schemas/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/Yacs/Schemas/foreach4.xml b/Yacs/Schemas/foreach4.xml index fe4885b..1ba60ad 100644 --- a/Yacs/Schemas/foreach4.xml +++ b/Yacs/Schemas/foreach4.xml @@ -41,7 +41,7 @@ diff --git a/Yacs/Schemas/foreach5.xml b/Yacs/Schemas/foreach5.xml index b00ef43..bfc0419 100644 --- a/Yacs/Schemas/foreach5.xml +++ b/Yacs/Schemas/foreach5.xml @@ -43,7 +43,7 @@ @@ -65,7 +65,7 @@ diff --git a/Yacs/Schemas/foreach6.xml b/Yacs/Schemas/foreach6.xml index 6e509e9..dbd53b9 100644 --- a/Yacs/Schemas/foreach6.xml +++ b/Yacs/Schemas/foreach6.xml @@ -46,14 +46,14 @@ diff --git a/Yacs/Schemas/foreach_LongCorba.xml b/Yacs/Schemas/foreach_LongCorba.xml index 57985a3..01c4063 100644 --- a/Yacs/Schemas/foreach_LongCorba.xml +++ b/Yacs/Schemas/foreach_LongCorba.xml @@ -41,7 +41,7 @@ diff --git a/Yacs/Schemas/foreach_LongPython.xml b/Yacs/Schemas/foreach_LongPython.xml index 0eec659..8fc8fcc 100644 --- a/Yacs/Schemas/foreach_LongPython.xml +++ b/Yacs/Schemas/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/Yacs/Schemas/forloop1.xml b/Yacs/Schemas/forloop1.xml index deb44a1..6f33568 100644 --- a/Yacs/Schemas/forloop1.xml +++ b/Yacs/Schemas/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/Yacs/Schemas/forloop2.xml b/Yacs/Schemas/forloop2.xml index b885c85..7df3d84 100644 --- a/Yacs/Schemas/forloop2.xml +++ b/Yacs/Schemas/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/Yacs/Schemas/forloop3.xml b/Yacs/Schemas/forloop3.xml index 54b69aa..b1866b7 100644 --- a/Yacs/Schemas/forloop3.xml +++ b/Yacs/Schemas/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/Yacs/Schemas/forloop4.xml b/Yacs/Schemas/forloop4.xml index f226610..cc0cc08 100644 --- a/Yacs/Schemas/forloop4.xml +++ b/Yacs/Schemas/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/Yacs/Schemas/forloop5.xml b/Yacs/Schemas/forloop5.xml index 2bedd84..c9d0bb9 100644 --- a/Yacs/Schemas/forloop5.xml +++ b/Yacs/Schemas/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/Yacs/Schemas/forloop6.xml b/Yacs/Schemas/forloop6.xml index 19520a3..fc6bfbf 100644 --- a/Yacs/Schemas/forloop6.xml +++ b/Yacs/Schemas/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/Yacs/Schemas/forloop7.xml b/Yacs/Schemas/forloop7.xml index 4fe0bca..892aa0e 100644 --- a/Yacs/Schemas/forloop7.xml +++ b/Yacs/Schemas/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/Yacs/Schemas/forwhile1.xml b/Yacs/Schemas/forwhile1.xml index 62d2b09..aa8019f 100644 --- a/Yacs/Schemas/forwhile1.xml +++ b/Yacs/Schemas/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/Yacs/Schemas/fschema.xml b/Yacs/Schemas/fschema.xml index f097946..cda1b0f 100644 --- a/Yacs/Schemas/fschema.xml +++ b/Yacs/Schemas/fschema.xml @@ -27,7 +27,7 @@ def f(p1): - print p1;p1=2*p1 + print(p1);p1=2*p1 return p1 diff --git a/Yacs/Schemas/gobj1.xml b/Yacs/Schemas/gobj1.xml index e22d78d..480e7e3 100644 --- a/Yacs/Schemas/gobj1.xml +++ b/Yacs/Schemas/gobj1.xml @@ -56,7 +56,7 @@ @@ -91,7 +91,7 @@ @@ -100,7 +100,7 @@ diff --git a/Yacs/Schemas/integer1.xml b/Yacs/Schemas/integer1.xml index 6070266..6db014b 100644 --- a/Yacs/Schemas/integer1.xml +++ b/Yacs/Schemas/integer1.xml @@ -125,7 +125,7 @@ @@ -146,7 +146,7 @@ diff --git a/Yacs/Schemas/legendre7.xml b/Yacs/Schemas/legendre7.xml index ee31e7c..51ef07d 100644 --- a/Yacs/Schemas/legendre7.xml +++ b/Yacs/Schemas/legendre7.xml @@ -35,7 +35,7 @@ @@ -73,7 +73,7 @@ diff --git a/Yacs/Schemas/objref1.xml b/Yacs/Schemas/objref1.xml index 34d92d9..922908f 100644 --- a/Yacs/Schemas/objref1.xml +++ b/Yacs/Schemas/objref1.xml @@ -64,7 +64,7 @@ @@ -96,7 +96,7 @@ @@ -105,7 +105,7 @@ diff --git a/Yacs/Schemas/objref2.xml b/Yacs/Schemas/objref2.xml index 5de190c..1bf089f 100644 --- a/Yacs/Schemas/objref2.xml +++ b/Yacs/Schemas/objref2.xml @@ -43,8 +43,8 @@ diff --git a/Yacs/Schemas/optimizer1.xml b/Yacs/Schemas/optimizer1.xml index a63fcda..a30fe3f 100644 --- a/Yacs/Schemas/optimizer1.xml +++ b/Yacs/Schemas/optimizer1.xml @@ -27,7 +27,7 @@ diff --git a/Yacs/Schemas/optimizer2.xml b/Yacs/Schemas/optimizer2.xml index 6c9d5cf..8d2de65 100644 --- a/Yacs/Schemas/optimizer2.xml +++ b/Yacs/Schemas/optimizer2.xml @@ -28,7 +28,7 @@ diff --git a/Yacs/Schemas/pschema.xml b/Yacs/Schemas/pschema.xml index c64d586..f00674e 100644 --- a/Yacs/Schemas/pschema.xml +++ b/Yacs/Schemas/pschema.xml @@ -54,27 +54,27 @@ @@ -112,10 +112,10 @@ @@ -123,14 +123,14 @@ diff --git a/Yacs/Schemas/refcnt1.xml b/Yacs/Schemas/refcnt1.xml index 84ba725..6124fa7 100644 --- a/Yacs/Schemas/refcnt1.xml +++ b/Yacs/Schemas/refcnt1.xml @@ -28,7 +28,7 @@ def f(p1): global a a=a+1 - print a + print(a) return p1 diff --git a/Yacs/Schemas/schema2.xml b/Yacs/Schemas/schema2.xml index cf2c204..d6ac2f6 100644 --- a/Yacs/Schemas/schema2.xml +++ b/Yacs/Schemas/schema2.xml @@ -57,27 +57,27 @@ @@ -115,10 +115,10 @@ @@ -126,14 +126,14 @@ diff --git a/Yacs/Schemas/sinline1.xml b/Yacs/Schemas/sinline1.xml index 8d3595d..802dc69 100644 --- a/Yacs/Schemas/sinline1.xml +++ b/Yacs/Schemas/sinline1.xml @@ -28,14 +28,14 @@ salome.salome_init() import PYHELLO_ORB def f(p1): - print __container__from__YACS__ + print(__container__from__YACS__) machine,container=__container__from__YACS__.split('/') param={} param['hostname']=machine param['container_name']=container compo=salome.lcc.LoadComponent(param, "PYHELLO") - print compo.makeBanner(p1) - print p1 + print(compo.makeBanner(p1)) + print(p1) @@ -47,14 +47,14 @@ salome.salome_init() import HELLO_ORB def f(p1): - print __container__from__YACS__ + print(__container__from__YACS__) machine,container=__container__from__YACS__.split('/') param={} param['hostname']=machine param['container_name']=container compo=salome.lcc.LoadComponent(param, "HELLO") - print compo.makeBanner(p1) - print p1 + print(compo.makeBanner(p1)) + print(p1) @@ -65,14 +65,14 @@ salome.salome_init() import PYHELLO_ORB def f(p1): - print __container__from__YACS__ + print(__container__from__YACS__) machine,container=__container__from__YACS__.split('/') param={} param['hostname']=machine param['container_name']=container compo=salome.lcc.LoadComponent(param, "PYHELLO") - print compo.makeBanner(p1) - print p1 + print(compo.makeBanner(p1)) + print(p1) @@ -83,14 +83,14 @@ salome.salome_init() import HELLO_ORB def f(p1): - print __container__from__YACS__ + print(__container__from__YACS__) machine,container=__container__from__YACS__.split('/') param={} param['hostname']=machine param['container_name']=container compo=salome.lcc.LoadComponent(param, "HELLO") - print compo.makeBanner(p1) - print p1 + print(compo.makeBanner(p1)) + print(p1) diff --git a/Yacs/Schemas/sinline2.xml b/Yacs/Schemas/sinline2.xml index 5904b72..3c08b5a 100644 --- a/Yacs/Schemas/sinline2.xml +++ b/Yacs/Schemas/sinline2.xml @@ -29,14 +29,14 @@ salome.salome_init() import PYHELLO_ORB def f(p1): - print __container__from__YACS__ + print(__container__from__YACS__) machine,container=__container__from__YACS__.split('/') param={} param['hostname']=machine param['container_name']=container compo=salome.lcc.LoadComponent(param, "PYHELLO") - print compo.makeBanner(p1) - print p1 + print(compo.makeBanner(p1)) + print(p1) diff --git a/Yacs/Schemas/sinline3.xml b/Yacs/Schemas/sinline3.xml index 9ccc326..eba746c 100644 --- a/Yacs/Schemas/sinline3.xml +++ b/Yacs/Schemas/sinline3.xml @@ -28,15 +28,15 @@ import salome salome.salome_init() import PYHELLO_ORB - print __container__from__YACS__ + print(__container__from__YACS__) machine,container=__container__from__YACS__.split('/') param={} param['hostname']=machine param['container_name']=container compo=salome.lcc.LoadComponent(param, "PYHELLO") def f(p1): - print compo.makeBanner(p1) - print p1 + print(compo.makeBanner(p1)) + print(p1) diff --git a/Yacs/Schemas/sinline4.xml b/Yacs/Schemas/sinline4.xml index 9053eeb..0ab11b8 100644 --- a/Yacs/Schemas/sinline4.xml +++ b/Yacs/Schemas/sinline4.xml @@ -30,14 +30,14 @@ salome.salome_init() import PYHELLO_ORB def f(p1): - print __container__from__YACS__ + print(__container__from__YACS__) machine,container=__container__from__YACS__.split('/') param={} param['hostname']=machine param['container_name']=container compo=salome.lcc.LoadComponent(param, "PYHELLO") - print compo.makeBanner(p1) - print p1 + print(compo.makeBanner(p1)) + print(p1) @@ -49,14 +49,14 @@ salome.salome_init() import HELLO_ORB def f(p1): - print __container__from__YACS__ + print(__container__from__YACS__) machine,container=__container__from__YACS__.split('/') param={} param['hostname']=machine param['container_name']=container compo=salome.lcc.LoadComponent(param, "HELLO") - print compo.makeBanner(p1) - print p1 + print(compo.makeBanner(p1)) + print(p1) @@ -67,14 +67,14 @@ salome.salome_init() import PYHELLO_ORB def f(p1): - print __container__from__YACS__ + print(__container__from__YACS__) machine,container=__container__from__YACS__.split('/') param={} param['hostname']=machine param['container_name']=container compo=salome.lcc.LoadComponent(param, "PYHELLO") - print compo.makeBanner(p1) - print p1 + print(compo.makeBanner(p1)) + print(p1) @@ -85,14 +85,14 @@ salome.salome_init() import HELLO_ORB def f(p1): - print __container__from__YACS__ + print(__container__from__YACS__) machine,container=__container__from__YACS__.split('/') param={} param['hostname']=machine param['container_name']=container compo=salome.lcc.LoadComponent(param, "HELLO") - print compo.makeBanner(p1) - print p1 + print(compo.makeBanner(p1)) + print(p1) diff --git a/Yacs/Schemas/sinline5.xml b/Yacs/Schemas/sinline5.xml index d9bf547..d8e6d1e 100644 --- a/Yacs/Schemas/sinline5.xml +++ b/Yacs/Schemas/sinline5.xml @@ -40,15 +40,15 @@ import salome salome.salome_init() import PYHELLO_ORB - print __container__from__YACS__ + print(__container__from__YACS__) machine,container=__container__from__YACS__.split('/') param={} param['hostname']=machine param['container_name']=container compo=salome.lcc.LoadComponent(param, "PYHELLO") def f(p1): - print compo.makeBanner(p1) - print p1 + print(compo.makeBanner(p1)) + print(p1) return p1 @@ -58,7 +58,7 @@ diff --git a/Yacs/Schemas/string1.xml b/Yacs/Schemas/string1.xml index edaa65e..2807a57 100644 --- a/Yacs/Schemas/string1.xml +++ b/Yacs/Schemas/string1.xml @@ -125,7 +125,7 @@ @@ -146,7 +146,7 @@ diff --git a/Yacs/Schemas/struct1.xml b/Yacs/Schemas/struct1.xml index e76c722..ac734fa 100644 --- a/Yacs/Schemas/struct1.xml +++ b/Yacs/Schemas/struct1.xml @@ -64,14 +64,14 @@ @@ -92,15 +92,15 @@ @@ -125,7 +125,7 @@ diff --git a/Yacs/Schemas/study1.xml b/Yacs/Schemas/study1.xml index 43098c9..e9da907 100644 --- a/Yacs/Schemas/study1.xml +++ b/Yacs/Schemas/study1.xml @@ -38,7 +38,7 @@ diff --git a/Yacs/Schemas/switch1.xml b/Yacs/Schemas/switch1.xml index 4a2c6bf..1fe47d3 100644 --- a/Yacs/Schemas/switch1.xml +++ b/Yacs/Schemas/switch1.xml @@ -26,21 +26,21 @@ - + - + - + diff --git a/Yacs/Schemas/switch2.xml b/Yacs/Schemas/switch2.xml index 4d3aa7b..1dd6ab9 100644 --- a/Yacs/Schemas/switch2.xml +++ b/Yacs/Schemas/switch2.xml @@ -26,21 +26,21 @@ - + - + - + diff --git a/Yacs/Schemas/switch3.xml b/Yacs/Schemas/switch3.xml index 22672c5..a72ca8d 100644 --- a/Yacs/Schemas/switch3.xml +++ b/Yacs/Schemas/switch3.xml @@ -32,21 +32,21 @@ - + - + - + diff --git a/Yacs/Schemas/switch4.xml b/Yacs/Schemas/switch4.xml index 9ba061a..960c63d 100644 --- a/Yacs/Schemas/switch4.xml +++ b/Yacs/Schemas/switch4.xml @@ -32,7 +32,7 @@ @@ -40,21 +40,21 @@ - + - + - + diff --git a/Yacs/Schemas/switch5.xml b/Yacs/Schemas/switch5.xml index c2a34ab..badfb00 100644 --- a/Yacs/Schemas/switch5.xml +++ b/Yacs/Schemas/switch5.xml @@ -32,7 +32,7 @@ @@ -40,7 +40,7 @@ - + @@ -48,7 +48,7 @@ - + @@ -56,7 +56,7 @@ - + diff --git a/Yacs/Schemas/switch6.xml b/Yacs/Schemas/switch6.xml index e019da8..36c0ca8 100644 --- a/Yacs/Schemas/switch6.xml +++ b/Yacs/Schemas/switch6.xml @@ -31,7 +31,7 @@ @@ -40,21 +40,21 @@ - + - + - + diff --git a/Yacs/Schemas/switch7.xml b/Yacs/Schemas/switch7.xml index b342948..380bf34 100644 --- a/Yacs/Schemas/switch7.xml +++ b/Yacs/Schemas/switch7.xml @@ -31,7 +31,7 @@ @@ -39,7 +39,7 @@ - + @@ -47,7 +47,7 @@ - + @@ -55,7 +55,7 @@ - + diff --git a/Yacs/Schemas/switch8.xml b/Yacs/Schemas/switch8.xml index 5105edb..bd54ed5 100644 --- a/Yacs/Schemas/switch8.xml +++ b/Yacs/Schemas/switch8.xml @@ -31,7 +31,7 @@ @@ -39,7 +39,7 @@ - + @@ -48,7 +48,7 @@ @@ -64,7 +64,7 @@ - + diff --git a/Yacs/Schemas/switch9.xml b/Yacs/Schemas/switch9.xml index 5ba11af..95cca17 100644 --- a/Yacs/Schemas/switch9.xml +++ b/Yacs/Schemas/switch9.xml @@ -29,7 +29,7 @@ @@ -37,7 +37,7 @@ - + @@ -47,7 +47,7 @@ @@ -70,7 +70,7 @@ - + diff --git a/Yacs/Schemas/triangle5error.xml b/Yacs/Schemas/triangle5error.xml index 79498b1..4cee969 100644 --- a/Yacs/Schemas/triangle5error.xml +++ b/Yacs/Schemas/triangle5error.xml @@ -26,7 +26,7 @@ @@ -43,7 +43,7 @@ print c diff --git a/Yacs/Schemas/while1.xml b/Yacs/Schemas/while1.xml index 84aadb1..8e39165 100644 --- a/Yacs/Schemas/while1.xml +++ b/Yacs/Schemas/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/Yacs/Schemas/while2.xml b/Yacs/Schemas/while2.xml index c848f1b..7781b01 100644 --- a/Yacs/Schemas/while2.xml +++ b/Yacs/Schemas/while2.xml @@ -38,9 +38,9 @@ - + - + diff --git a/Yacs/Schemas/while3.xml b/Yacs/Schemas/while3.xml index 6042c03..6b11f05 100644 --- a/Yacs/Schemas/while3.xml +++ b/Yacs/Schemas/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 -- 2.30.2