Fix for "23669: [CEA 13186] YACS xml scheme files with calls to print function need...

diff --git a/Yacs/Schemas/aschema.xml b/Yacs/Schemas/aschema.xml
index 72261e3e029ef7c05ae11ef88b153dc900a97ac6..09d9e7f66cc17d94ee35fb0a2bc30b12c86bc77b 100644 (file)
--- a/Yacs/Schemas/aschema.xml
+++ b/Yacs/Schemas/aschema.xml
@@ -57,33 +57,33 @@
 
     <inline name="node98" >
         <script>
-            <code>print p1</code>
+            <code>print(p1)</code>
         </script>
         <inport name="p1" type="objvec"/>
     </inline>
     <inline name="node1" state="disabled">
         <script>
-            <code>print p1</code>
+            <code>print(p1)</code>
         </script>
         <inport name="p1" type="int"/>
     </inline>
     <inline name="node11" >
         <script>
-            <code>print p1</code>
+            <code>print(p1)</code>
         </script>
         <inport name="p1" type="string"/>
     </inline>
     <inline name="node12" >
         <script>
-            <code>print p1</code>
-            <code>print "coucou"</code>
+            <code>print(p1)</code>
+            <code>print("coucou")</code>
         </script>
         <inport name="p1" type="dblevec"/>
     </inline>
     <inline name="node13" >
         <script>
-            <code><![CDATA[print p1]]></code>
-            <code><![CDATA[print "coucou"]]> </code>
+            <code><![CDATA[print(p1)]]></code>
+            <code><![CDATA[print("coucou")]]> </code>
             <code><![CDATA[a=1/0]]> </code>
         </script>
         <inport name="p1" type="dblevecvec"/>
@@ -122,10 +122,10 @@
         <script>
            <code>import eo</code>
            <code>obj=obj._narrow(eo.Echo)</code>
-           <code>print p1</code>
-           <code>print obj</code>
+           <code>print(p1)</code>
+           <code>print(obj)</code>
            <code>p2=obj.echoC(p1)</code>
-           <code>print p2</code>
+           <code>print(p2)</code>
         </script>
         <inport name="p1" type="eo/C"/>
         <inport name="obj" type="Echo"/>
@@ -133,14 +133,14 @@
     </inline>
     <inline name="node34" >
         <script>
-        <code>print p1;p2=p1</code>
+        <code>print(p1);p2=p1</code>
         </script>
         <inport name="p1" type="eo/C"/>
         <outport name="p2" type="eo/C"/>
     </inline>
     <inline name="node35" >
         <script>
-        <code>print p1;p2=p1</code>
+        <code>print(p1);p2=p1</code>
         </script>
         <inport name="p1" type="eo/C"/>
         <outport name="p2" type="eo/C"/>

diff --git a/Yacs/Schemas/bid.xml b/Yacs/Schemas/bid.xml
index a79d50ae572b59051d629fd12a48e43f1b51bc40..c76d4098556dd1a7c35502448ec9c3945ea9aeb3 100644 (file)
--- a/Yacs/Schemas/bid.xml
+++ b/Yacs/Schemas/bid.xml
@@ -43,7 +43,7 @@
             <inline name="node1" >
                 <function name="f">
                     <code>def f(p1):</code>
-                    <code>  print p1;p1=2*p1 </code>
+                    <code>  print(p1);p1=2*p1 </code>
                     <code>  return p1 </code>
                 </function>
                 <inport name="p1" type="string"/>

diff --git a/Yacs/Schemas/bloc1.xml b/Yacs/Schemas/bloc1.xml
index dd2a0d4ba16b65aa66f8e9f71ce43d561ab842d0..72ea6077f99aa890f4e147185155f84ac94cb214 100644 (file)
--- a/Yacs/Schemas/bloc1.xml
+++ b/Yacs/Schemas/bloc1.xml
@@ -43,7 +43,7 @@
             <inline name="node1" >
                 <function name="f">
                     <code>def f(p1):</code>
-                    <code>  print p1;p1=2*p1 </code>
+                    <code>  print(p1);p1=2*p1 </code>
                     <code>  return p1 </code>
                 </function>
                 <inport name="p1" type="string"/>

diff --git a/Yacs/Schemas/bloc2.xml b/Yacs/Schemas/bloc2.xml
index f24cc995347de2983d4f1e4a325c7128fb5c7e33..17f01fe8ff9f6010dd4f2a78910ef76b89869ebb 100644 (file)
--- a/Yacs/Schemas/bloc2.xml
+++ b/Yacs/Schemas/bloc2.xml
@@ -57,8 +57,8 @@
             <inline name="node1" >
                 <function name="f">
                     <code>def f(p1):</code>
-                    <code>  print p1;p1=2*p1 </code>
-                    <code>  print "coucou b1.b2.node1" </code>
+                    <code>  print(p1);p1=2*p1 </code>
+                    <code>  print("coucou b1.b2.node1")</code>
                     <code>  return p1 </code>
                 </function>
                 <inport name="p1" type="string"/>

diff --git a/Yacs/Schemas/bloc3.xml b/Yacs/Schemas/bloc3.xml
index 68e0d553be23713e42ebfb553d107f7b0c835c49..ad1038b8aac77654f6f6ed9f63c3f6c60ed7c503 100644 (file)
--- a/Yacs/Schemas/bloc3.xml
+++ b/Yacs/Schemas/bloc3.xml
@@ -52,7 +52,7 @@
             <inline name="node1" >
                 <function name="f">
                     <code>  def f(p1):</code>
-                    <code>  print p1;p1=2*p1 </code>
+                    <code>  print(p1);p1=2*p1 </code>
                     <code>  return p1 </code>
                 </function>
                 <inport name="p1" type="string"/>

diff --git a/Yacs/Schemas/bloc4.xml b/Yacs/Schemas/bloc4.xml
index 77ed2cf05ef547648be939cc0b70e9b1faae25ae..293a874487ffa12be86ae436e8e52244bd1aceec 100644 (file)
--- a/Yacs/Schemas/bloc4.xml
+++ b/Yacs/Schemas/bloc4.xml
@@ -51,7 +51,7 @@
         <inline name="node2" >
                 <function name="f">
                     <code>def f(s1):</code>
-                    <code>  print s1 </code>
+                    <code>  print(s1) </code>
                     <code>  return s1 </code>
                 </function>
                 <inport name="s1" type="dblevec"/>
@@ -61,7 +61,7 @@
             <inline name="node1" >
                 <function name="f">
                     <code>def f(p1):</code>
-                    <code>  print p1;p1=2*p1 </code>
+                    <code>  print(p1);p1=2*p1 </code>
                     <code>  return p1 </code>
                 </function>
                 <inport name="p1" type="string"/>

diff --git a/Yacs/Schemas/bool1.xml b/Yacs/Schemas/bool1.xml
index 4e94b33884fc38668fbee3836815c585e3d94ae6..c99e93430a707036f389e8b671cc25bd01bacdf3 100644 (file)
--- a/Yacs/Schemas/bool1.xml
+++ b/Yacs/Schemas/bool1.xml
@@ -125,7 +125,7 @@
 
     <inline name="pyth5" >
       <script>
-        <code>print p1</code>
+        <code>print(p1)</code>
       </script>
       <inport name="p1" type="boolvec"/>
       <outport name="p1" type="boolvec"/>
@@ -146,7 +146,7 @@
 
     <inline name="pyth6" >
       <script>
-        <code>print p1</code>
+        <code>print(p1)</code>
       </script>
       <inport name="p1" type="boolvec"/>
       <outport name="p1" type="boolvec"/>

diff --git a/Yacs/Schemas/cpp1.xml b/Yacs/Schemas/cpp1.xml
index bf46fe1a3dfdf7414b0e4356e1212fc90cea5fa8..04bfb4bb578a903080d87a9f969d7c21b829b52c 100644 (file)
--- a/Yacs/Schemas/cpp1.xml
+++ b/Yacs/Schemas/cpp1.xml
@@ -63,7 +63,7 @@
 
     <inline name="pyth1" >
       <script>
-        <code>print p1</code>
+        <code>print(p1)</code>
       </script>
       <inport name="p1" type="double"/>
       <outport name="p1" type="double"/>
@@ -71,21 +71,21 @@
 
     <inline name="pyth2" >
       <script>
-        <code>print p1</code>
+        <code>print(p1)</code>
       </script>
       <inport name="p1" type="double"/>
       <outport name="p1" type="double"/>
     </inline>
     <inline name="pyth3" >
       <script>
-        <code>print p1</code>
+        <code>print(p1)</code>
       </script>
       <inport name="p1" type="double"/>
       <outport name="p1" type="double"/>
     </inline>
     <inline name="pyth4" >
       <script>
-        <code>print p1</code>
+        <code>print(p1)</code>
       </script>
       <inport name="p1" type="double"/>
       <outport name="p1" type="double"/>
@@ -144,7 +144,7 @@
     </foreach>
     <inline name="pyth5" >
       <script>
-        <code>print p1</code>
+        <code>print(p1)</code>
       </script>
       <inport name="p1" type="dblevec"/>
       <outport name="p1" type="dblevec"/>

diff --git a/Yacs/Schemas/datanode0.xml b/Yacs/Schemas/datanode0.xml
index ad0ad7cecbafbce0f14be675dd254c0089e1f23c..e628bd6a881aa91dce2d70cf1ddc6467d5d61aba 100644 (file)
--- a/Yacs/Schemas/datanode0.xml
+++ b/Yacs/Schemas/datanode0.xml
@@ -28,14 +28,14 @@
         </datanode>
 
         <inline name="n2" >
-          <script><code>print p1</code></script>
+          <script><code>print(p1)</code></script>
           <inport name="p1" type="double"/>
           <outport name="p1" type="double"/>
         </inline>
 
         <bloc name="b">
         <inline name="n2" >
-          <script><code>print p1</code></script>
+          <script><code>print(p1)</code></script>
           <inport name="p1" type="double"/>
           <outport name="p1" type="double"/>
         </inline>

diff --git a/Yacs/Schemas/double1.xml b/Yacs/Schemas/double1.xml
index c8368064b29b854b1e9135d3744d6ea51e84a510..1fce924f28e632a3c2f55333177ee6b5cb420d56 100644 (file)
--- a/Yacs/Schemas/double1.xml
+++ b/Yacs/Schemas/double1.xml
@@ -125,7 +125,7 @@
 
     <inline name="pyth5" >
       <script>
-        <code>print p1</code>
+        <code>print(p1)</code>
       </script>
       <inport name="p1" type="dblevec"/>
       <outport name="p1" type="dblevec"/>
@@ -146,7 +146,7 @@
 
     <inline name="pyth6" >
       <script>
-        <code>print p1</code>
+        <code>print(p1)</code>
       </script>
       <inport name="p1" type="dblevec"/>
       <outport name="p1" type="dblevec"/>

diff --git a/Yacs/Schemas/err0.xml b/Yacs/Schemas/err0.xml
index 899eff08f6fd27dded56e7268c9c2601ab4682fb..14a73b38230fca08e19a5ca799e0a22348e7dc05 100644 (file)
--- a/Yacs/Schemas/err0.xml
+++ b/Yacs/Schemas/err0.xml
@@ -27,7 +27,7 @@
     <inline name="node0" >
       <script>
         <code>p1="toto"</code>
-        <code>print p1</code>
+        <code>print(p1)</code>
       </script>
       <outport name="p1" type="string"/>
     </inline>
@@ -45,7 +45,7 @@
     <inline name="node0" >
       <script>
         <code>p1="toto"</code>
-        <code>print p1</code>
+        <code>print(p1)</code>
         <code>#a=1/0</code>
       </script>
       <outport name="p1" type="string"/>

diff --git a/Yacs/Schemas/err1.xml b/Yacs/Schemas/err1.xml
index 7c4d37dee95f75a9dc7d90b783579928ddfd3913..2d934583bf5d315b5bcd0104821379c9f2d791b6 100644 (file)
--- a/Yacs/Schemas/err1.xml
+++ b/Yacs/Schemas/err1.xml
@@ -28,7 +28,7 @@
     <inline name="node0" >
       <script>
         <code>p1="toto"</code>
-        <code>print p1</code>
+        <code>print(p1)</code>
       </script>
       <outport name="p1" type="string"/>
     </inline>
@@ -46,7 +46,7 @@
     <inline name="node0" >
       <script>
         <code>p1="toto"</code>
-        <code>print p1</code>
+        <code>print(p1)</code>
         <code>#a=1/0</code>
       </script>
       <inport name="p1" type="string"/>

diff --git a/Yacs/Schemas/err2.xml b/Yacs/Schemas/err2.xml
index 08cc1ff9d09295fbdca53179a953a2a61396c852..1a5a2789be41490b1f01202d8c470731085c9db1 100644 (file)
--- a/Yacs/Schemas/err2.xml
+++ b/Yacs/Schemas/err2.xml
@@ -28,7 +28,7 @@
     <inline name="node0" >
       <script>
         <code>p1="toto"</code>
-        <code>print p1</code>
+        <code>print(p1)</code>
       </script>
       <outport name="p1" type="string"/>
     </inline>
@@ -46,7 +46,7 @@
     <inline name="node0" >
       <script>
         <code>p1="toto"</code>
-        <code>print p1</code>
+        <code>print(p1)</code>
         <code>a=1/0</code>
       </script>
       <outport name="p1" type="string"/>

diff --git a/Yacs/Schemas/err3.xml b/Yacs/Schemas/err3.xml
index 62640432b4aefa112b17f97f99e2aac6b7559d45..5f478e22840a2fd6df8f7339c09151a180c77079 100644 (file)
--- a/Yacs/Schemas/err3.xml
+++ b/Yacs/Schemas/err3.xml
@@ -31,7 +31,7 @@
     </inline>
     <inline name="n2" >
         <script>
-            <code>print p1</code>
+            <code>print(p1)</code>
         </script>
         <inport name="p1" type="double"/>
         <outport name="p1" type="double"/>
@@ -39,21 +39,21 @@
     <switch name="b1">
       <case id="1">
         <inline name="n2" >
-          <script><code>print p1</code></script>
+          <script><code>print(p1)</code></script>
           <inport name="p1" type="double"/>
           <outport name="p1" type="double"/>
         </inline>
       </case>
       <case id="3">
         <inline name="n2" >
-          <script><code>print p1</code></script>
+          <script><code>print(p1)</code></script>
           <inport name="p1" type="double"/>
           <outport name="p1" type="double"/>
         </inline>
       </case>
       <default>
         <inline name="n2" >
-          <script><code>print p1</code></script>
+          <script><code>print(p1)</code></script>
           <inport name="p1" type="double"/>
           <outport name="p1" type="double"/>
         </inline>

diff --git a/Yacs/Schemas/eschema.xml b/Yacs/Schemas/eschema.xml
index ad08ce4446b27a7a4cf44d61dd4da980878fa708..084b64659fc6ffe130a74db05ee4a41b2ce1a3b2 100644 (file)
--- a/Yacs/Schemas/eschema.xml
+++ b/Yacs/Schemas/eschema.xml
@@ -25,7 +25,7 @@
     <!-- service -->
 
     <inline name="node1" >
-        <script><code>print p1;p1=2*p1</code></script>
+        <script><code>print(p1);p1=2*p1</code></script>
         <inport name="p1" type="string"/>
         <outport name="p1" type="string"/>
     </inline>

diff --git a/Yacs/Schemas/file1.xml b/Yacs/Schemas/file1.xml
index 87bcd3f3ccae7c10520a837d1691546e7f4aab49..883eaa6f742851ca586747ba8f68c35aec88c658 100644 (file)
--- a/Yacs/Schemas/file1.xml
+++ b/Yacs/Schemas/file1.xml
@@ -31,7 +31,7 @@
     <inline name="node0" >
       <script>
         <code>p1="toto"</code>
-        <code>print p1</code>
+        <code>print(p1)</code>
       </script>
       <outport name="p1" type="string"/>
     </inline>
@@ -56,7 +56,7 @@
 
     <inline name="node3" >
       <script>
-        <code>print "node3:",p1</code>
+        <code>print("node3:",p1)</code>
       </script>
       <inport name="p1" type="file"/>
     </inline>

diff --git a/Yacs/Schemas/foreach1.xml b/Yacs/Schemas/foreach1.xml
index 4b10780170077c9915ff9bc33c03dd81ff633eb1..c1505e964a5e935ecb1ffe5aa8d719983576e210 100644 (file)
--- a/Yacs/Schemas/foreach1.xml
+++ b/Yacs/Schemas/foreach1.xml
@@ -38,9 +38,9 @@
             <code>def f(p1):</code>
             <code>  global a</code>
             <code>  p1= p1+10.</code>
-            <code>  print a</code>
+            <code>  print(a)</code>
             <code>  a=a+p1</code>
-            <code>  print a</code>
+            <code>  print(a)</code>
             <code>  return p1</code>
         </function>
         <inport name="p1" type="double"/>
@@ -49,7 +49,7 @@
     </foreach>
     <inline name="node1" >
       <script>
-        <code>print p1</code>
+        <code>print(p1)</code>
       </script>
       <inport name="p1" type="dblevec"/>
     </inline>

diff --git a/Yacs/Schemas/foreach2.xml b/Yacs/Schemas/foreach2.xml
index 33df77f1b0834c1cda68e89fea60a9c721273f47..7f114cdffe1c3b0c8e61a4dbf1576fcfeae0e160 100644 (file)
--- a/Yacs/Schemas/foreach2.xml
+++ b/Yacs/Schemas/foreach2.xml
@@ -39,9 +39,9 @@
             <code>def f(p1):</code>
             <code>  global a</code>
             <code>  p1= p1+10.</code>
-            <code>  print a</code>
+            <code>  print(a)</code>
             <code>  a=a+p1</code>
-            <code>  print a</code>
+            <code>  print(a)</code>
             <code>  return p1</code>
         </function>
         <inport name="p1" type="double"/>
@@ -55,7 +55,7 @@
   </bloc>
     <inline name="node1" >
       <script>
-        <code>print p1</code>
+        <code>print(p1)</code>
       </script>
       <inport name="p1" type="dblevec"/>
     </inline>

diff --git a/Yacs/Schemas/foreach3.xml b/Yacs/Schemas/foreach3.xml
index 5664ea2565ca1baa6d24d1b38d65fb65997cf755..779446af6082ff215d880af3a9953c91e5c00504 100644 (file)
--- a/Yacs/Schemas/foreach3.xml
+++ b/Yacs/Schemas/foreach3.xml
@@ -38,9 +38,9 @@
             <code>def f(p1):</code>
             <code>  global a</code>
             <code>  p1= p1+10.</code>
-            <code>  print a</code>
+            <code>  print(a)</code>
             <code>  a=a+p1</code>
-            <code>  print a</code>
+            <code>  print(a)</code>
             <code>  return p1</code>
         </function>
         <inport name="p1" type="double"/>
@@ -49,7 +49,7 @@
     </foreach>
     <inline name="node1" >
       <script>
-        <code>print p1</code>
+        <code>print(p1)</code>
       </script>
       <inport name="p1" type="double"/>
     </inline>

diff --git a/Yacs/Schemas/foreach4.xml b/Yacs/Schemas/foreach4.xml
index fe4885b2d58b8f66d37585f758c44cd36c757c2d..1ba60ad34de1c8b3e9d40ff6bd9615e684d5e326 100644 (file)
--- a/Yacs/Schemas/foreach4.xml
+++ b/Yacs/Schemas/foreach4.xml
@@ -41,7 +41,7 @@
     </foreach>
     <inline name="node1" >
       <script>
-        <code>print p1</code>
+        <code>print(p1)</code>
       </script>
       <inport name="p1" type="dblevec"/>
     </inline>

diff --git a/Yacs/Schemas/foreach5.xml b/Yacs/Schemas/foreach5.xml
index b00ef43703bcac7e05d985f5cad09ca804513dee..bfc0419cecbe99a1c9b3c6c00c8b474700daeb63 100644 (file)
--- a/Yacs/Schemas/foreach5.xml
+++ b/Yacs/Schemas/foreach5.xml
@@ -43,7 +43,7 @@
     </foreach>
     <inline name="node3" >
       <script>
-        <code>print "coucou"</code>
+        <code>print("coucou")</code>
       </script>
     </inline>
     <service name="node4" >
@@ -65,7 +65,7 @@
   </bloc>
     <inline name="node1" >
       <script>
-        <code>print p1</code>
+        <code>print(p1)</code>
       </script>
       <inport name="p1" type="dblevec"/>
     </inline>

diff --git a/Yacs/Schemas/foreach6.xml b/Yacs/Schemas/foreach6.xml
index 6e509e9eef877b0b105194468a55e93dbc291788..dbd53b9f8f8fd00d50b804b66ce7fbd58569ab0a 100644 (file)
--- a/Yacs/Schemas/foreach6.xml
+++ b/Yacs/Schemas/foreach6.xml
@@ -46,14 +46,14 @@
 
     <inline name="node1" >
       <script>
-        <code>print p1</code>
+        <code>print(p1)</code>
       </script>
       <inport name="p1" type="intvecvec"/>
       <outport name="p1" type="intvecvec"/>
     </inline>
     <inline name="node3" >
       <script>
-        <code>print p1</code>
+        <code>print(p1)</code>
       </script>
       <inport name="p1" type="intvecvec"/>
     </inline>

diff --git a/Yacs/Schemas/foreach_LongCorba.xml b/Yacs/Schemas/foreach_LongCorba.xml
index 57985a33a949a04ac97288541fb41519efbedb29..01c40630b519d10a42980d91534da886d4749fb8 100644 (file)
--- a/Yacs/Schemas/foreach_LongCorba.xml
+++ b/Yacs/Schemas/foreach_LongCorba.xml
@@ -41,7 +41,7 @@
     </foreach>
     <inline name="node1" >
       <script>
-        <code>print p1</code>
+        <code>print(p1)</code>
       </script>
       <inport name="p1" type="dblevec"/>
     </inline>

diff --git a/Yacs/Schemas/foreach_LongPython.xml b/Yacs/Schemas/foreach_LongPython.xml
index 0eec659ed4ddf2657c488c52a8ebb427e2ab2f82..8fc8fcc26b3363c86e063ad889392039b9461046 100644 (file)
--- a/Yacs/Schemas/foreach_LongPython.xml
+++ b/Yacs/Schemas/foreach_LongPython.xml
@@ -36,9 +36,9 @@
         <function name="f">
             <code>import time</code>
             <code>def f(p1):</code>
-            <code>  print "+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ start ", p1</code>
+            <code>  print("+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ start ", p1)</code>
             <code>  time.sleep(0.1)</code>
-            <code>  print "----------------------------------------- stop  ", p1</code>
+            <code>  print("----------------------------------------- stop  ", p1)</code>
             <code>  return p1</code>
         </function>
         <inport name="p1" type="double"/>
@@ -47,7 +47,7 @@
     </foreach>
     <inline name="node1" >
       <script>
-        <code>print p1</code>
+        <code>print(p1)</code>
       </script>
       <inport name="p1" type="dblevec"/>
     </inline>

diff --git a/Yacs/Schemas/forloop1.xml b/Yacs/Schemas/forloop1.xml
index deb44a12867aeab013bc608fca5584ba4adae883..6f33568a49e5b8de1ff3134e976e94c229c6fee3 100644 (file)
--- a/Yacs/Schemas/forloop1.xml
+++ b/Yacs/Schemas/forloop1.xml
@@ -29,9 +29,9 @@
             <code>def f(p1):</code>
             <code>  global a</code>
             <code>  p1= p1+10.</code>
-            <code>  print a</code>
+            <code>  print(a)</code>
             <code>  a=a+p1</code>
-            <code>  print a</code>
+            <code>  print(a)</code>
             <code>  return p1</code>
         </function>
         <inport name="p1" type="double"/>

diff --git a/Yacs/Schemas/forloop2.xml b/Yacs/Schemas/forloop2.xml
index b885c85505c43b0574fe5c2e662a672149cd8e6f..7df3d848f1fd426a85c5d4552f80ef3ba27f17f3 100644 (file)
--- a/Yacs/Schemas/forloop2.xml
+++ b/Yacs/Schemas/forloop2.xml
@@ -29,9 +29,9 @@
             <code>def f(p1):</code>
             <code>  global a</code>
             <code>  p1= p1+10.</code>
-            <code>  print "a=",a</code>
+            <code>  print("a=",a)</code>
             <code>  a=a+p1</code>
-            <code>  print "a=",a</code>
+            <code>  print("a=",a)</code>
             <code>  return p1</code>
         </function>
         <inport name="p1" type="double"/>

diff --git a/Yacs/Schemas/forloop3.xml b/Yacs/Schemas/forloop3.xml
index 54b69aacfc9f7ee1266732086ec3edc0d0a0e13e..b1866b70bc0532e0ed8aeb7e583e8f6991e5ed70 100644 (file)
--- a/Yacs/Schemas/forloop3.xml
+++ b/Yacs/Schemas/forloop3.xml
@@ -35,9 +35,9 @@
             <code>def f(p1):</code>
             <code>  global a</code>
             <code>  p1= p1+10.</code>
-            <code>  print a</code>
+            <code>  print(a)</code>
             <code>  a=a+p1</code>
-            <code>  print a</code>
+            <code>  print(a)</code>
             <code>  return p1</code>
         </function>
         <inport name="p1" type="double"/>

diff --git a/Yacs/Schemas/forloop4.xml b/Yacs/Schemas/forloop4.xml
index f226610416edfe3c65b4e7683cb00357c93b3db4..cc0cc0831c7b3177d41fe37cc204e85f86937e1e 100644 (file)
--- a/Yacs/Schemas/forloop4.xml
+++ b/Yacs/Schemas/forloop4.xml
@@ -36,9 +36,9 @@
             <code>def f(p1):</code>
             <code>  global a</code>
             <code>  p1= p1+10.</code>
-            <code>  print a</code>
+            <code>  print(a)</code>
             <code>  a=a+p1</code>
-            <code>  print a</code>
+            <code>  print(a)</code>
             <code>  return p1</code>
           </function>
           <inport name="p1" type="double"/>

diff --git a/Yacs/Schemas/forloop5.xml b/Yacs/Schemas/forloop5.xml
index 2bedd846971cae3a0921a8b738bcd4354b6f9c65..c9d0bb9c9847ad13994d23b88dfbdbb769095207 100644 (file)
--- a/Yacs/Schemas/forloop5.xml
+++ b/Yacs/Schemas/forloop5.xml
@@ -37,9 +37,9 @@
                 <code>def f(p1):</code>
                 <code>  global a</code>
                 <code>  p1= p1+10.</code>
-                <code>  print a</code>
+                <code>  print(a)</code>
                 <code>  a=a+p1</code>
-                <code>  print a</code>
+                <code>  print(a)</code>
                 <code>  return p1</code>
               </function>
               <inport name="p1" type="double"/>

diff --git a/Yacs/Schemas/forloop6.xml b/Yacs/Schemas/forloop6.xml
index 19520a38c9d50aef54ed72f63613319c04138b9f..fc6bfbf1e1c5535b1b82d7b74b879fb8b4566bee 100644 (file)
--- a/Yacs/Schemas/forloop6.xml
+++ b/Yacs/Schemas/forloop6.xml
@@ -39,9 +39,9 @@
                   <code>def f(p1):</code>
                   <code>  global a</code>
                   <code>  p1= p1+10.</code>
-                  <code>  print a</code>
+                  <code>  print(a)</code>
                   <code>  a=a+p1</code>
-                  <code>  print a</code>
+                  <code>  print(a)</code>
                   <code>  return p1</code>
                 </function>
                 <inport name="p1" type="double"/>

diff --git a/Yacs/Schemas/forloop7.xml b/Yacs/Schemas/forloop7.xml
index 4fe0bca7b85a35c5509df0d6dc5bbbbbd3d00948..892aa0eccaf68cf509eb1a5f778544243a920359 100644 (file)
--- a/Yacs/Schemas/forloop7.xml
+++ b/Yacs/Schemas/forloop7.xml
@@ -37,9 +37,9 @@
                   <code>def f(p1):</code>
                   <code>  global a</code>
                   <code>  p1= p1+10.</code>
-                  <code>  print a</code>
+                  <code>  print(a)</code>
                   <code>  a=a+p1</code>
-                  <code>  print a</code>
+                  <code>  print(a)</code>
                   <code>  return p1</code>
                 </function>
                 <inport name="p1" type="double"/>

diff --git a/Yacs/Schemas/forwhile1.xml b/Yacs/Schemas/forwhile1.xml
index 62d2b09b5a65d16678a118b8291bbe96cc61c092..aa8019f40e87e3ba2058e241d8bc9fcbd8a7f7a0 100644 (file)
--- a/Yacs/Schemas/forwhile1.xml
+++ b/Yacs/Schemas/forwhile1.xml
@@ -41,9 +41,9 @@
                   <code>def f(p1):</code>
                   <code>  global a</code>
                   <code>  p1= p1+10.</code>
-                  <code>  print "a:",a</code>
+                  <code>  print("a:",a)</code>
                   <code>  a=a+p1</code>
-                  <code>  print "p1:",p1</code>
+                  <code>  print("p1:",p1)</code>
                   <code><![CDATA[  condition=(p1 < 40.)]]> </code>
                   <code>  return p1,condition</code>
                 </function>

diff --git a/Yacs/Schemas/fschema.xml b/Yacs/Schemas/fschema.xml
index f09794682b7d2824d976a87356aa9bff5331fc62..cda1b0f1f7534087ef4573a22695004bac96a440 100644 (file)
--- a/Yacs/Schemas/fschema.xml
+++ b/Yacs/Schemas/fschema.xml
@@ -27,7 +27,7 @@
     <inline name="node1" >
         <function name="f">
             <code>def f(p1):</code>
-            <code>  print p1;p1=2*p1 </code>
+            <code>  print(p1);p1=2*p1 </code>
             <code>  return p1 </code>
         </function>
         <inport name="p1" type="string"/>

diff --git a/Yacs/Schemas/gobj1.xml b/Yacs/Schemas/gobj1.xml
index e22d78d9bce51ffcd9b6ef1e6165aa9b5908d539..480e7e3807880cf664181d8aaddf756e1978a0fa 100644 (file)
--- a/Yacs/Schemas/gobj1.xml
+++ b/Yacs/Schemas/gobj1.xml
@@ -56,7 +56,7 @@
       <script>
         <code>import SALOME_MED</code>
         <code>p1=p1._narrow(SALOME_MED.FIELD)</code>
-        <code>print p1</code>
+        <code>print(p1)</code>
       </script>
       <inport name="p1" type="FIELDDOUBLE"/>
       <outport name="p1" type="FIELDDOUBLE"/>
@@ -91,7 +91,7 @@
 
     <inline name="pyth0" >
       <script>
-        <code>print "MEDFIELD:",p1</code>
+        <code>print("MEDFIELD:",p1)</code>
         <code>p1.Register()</code>
       </script>
       <inport name="p1" type="FIELDDOUBLE"/>
@@ -100,7 +100,7 @@
 
     <inline name="pyth1" >
       <script>
-        <code>print "MEDFIELD:",p1</code>
+        <code>print("MEDFIELD:",p1)</code>
       </script>
       <inport name="p1" type="FIELDDOUBLE"/>
     </inline>

diff --git a/Yacs/Schemas/integer1.xml b/Yacs/Schemas/integer1.xml
index 60702666b9976fc41aab58c1ea5dc613af5d6f7f..6db014b48566074485cc99c5dccce065b99e39f8 100644 (file)
--- a/Yacs/Schemas/integer1.xml
+++ b/Yacs/Schemas/integer1.xml
@@ -125,7 +125,7 @@
 
     <inline name="pyth5" >
       <script>
-        <code>print p1</code>
+        <code>print(p1)</code>
       </script>
       <inport name="p1" type="intvec"/>
       <outport name="p1" type="intvec"/>
@@ -146,7 +146,7 @@
 
     <inline name="pyth6" >
       <script>
-        <code>print p1</code>
+        <code>print(p1)</code>
       </script>
       <inport name="p1" type="intvec"/>
       <outport name="p1" type="intvec"/>

diff --git a/Yacs/Schemas/legendre7.xml b/Yacs/Schemas/legendre7.xml
index ee31e7c2b20c73fc6d55f13f2b8cf7777dd9a2a3..51ef07d82e98fb0bce81a5e7b86a902e5c1f017e 100644 (file)
--- a/Yacs/Schemas/legendre7.xml
+++ b/Yacs/Schemas/legendre7.xml
@@ -35,7 +35,7 @@
     <inline name="poly_7" >
        <script>
           <code>Pn=(429*x**7 -693*x**5+315*x**3 -35*x)/16</code>
-          <code>print "reference P7=",Pn</code>
+          <code>print("reference P7=",Pn)</code>
        </script>
        <inport name="x" type="double"/>
        <outport name="Pn" type="double"/>
@@ -73,7 +73,7 @@
           <inline name="iter1" >
              <script>
                 <code>Pn = ((2*n-1)*x*Pnm1 -(n-1)*Pnm2)/n</code>
-                <code>print "n=",n," Pn=",Pn</code>
+                <code>print("n=",n," Pn=",Pn)</code>
                 <code>n=n+1</code>
              </script>
              <inport name="Pnm1" type="double"/>

diff --git a/Yacs/Schemas/objref1.xml b/Yacs/Schemas/objref1.xml
index 34d92d9c9c6247e255418c8ec0febdd8fc9880ed..922908f660d7a4d1fd10b49f5bf0219c915c3b02 100644 (file)
--- a/Yacs/Schemas/objref1.xml
+++ b/Yacs/Schemas/objref1.xml
@@ -64,7 +64,7 @@
 
     <inline name="pyth6" >
       <script>
-        <code>print p1</code>
+        <code>print(p1)</code>
       </script>
       <inport name="p1" type="objvec"/>
       <outport name="p1" type="objvec"/>
@@ -96,7 +96,7 @@
     <foreach name="foreach4" nbranch="3" type="Obj" >
       <inline name="pyth" >
         <script>
-          <code>print p1</code>
+          <code>print(p1)</code>
         </script>
         <inport name="p1" type="Obj"/>
         <outport name="p1" type="Obj"/>
@@ -105,7 +105,7 @@
 
     <inline name="pyth7" >
       <script>
-        <code>print p1</code>
+        <code>print(p1)</code>
       </script>
       <inport name="p1" type="objvec"/>
       <outport name="p1" type="objvec"/>

diff --git a/Yacs/Schemas/objref2.xml b/Yacs/Schemas/objref2.xml
index 5de190c81b87b8352f74449c946e4114fcf7dcc0..1bf089ff70db82546cd08c84e72de5fcd7d6ed5b 100644 (file)
--- a/Yacs/Schemas/objref2.xml
+++ b/Yacs/Schemas/objref2.xml
@@ -43,8 +43,8 @@
 
     <inline name="pyth0" >
       <script>
-        <code>print "p1",p1</code>
-        <code>print "p2",p2</code>
+        <code>print("p1",p1)</code>
+        <code>print("p2",p2)</code>
         <code>p1=[p1,p2,p2,p1]</code>
       </script>
       <inport name="p1" type="Obj"/>

diff --git a/Yacs/Schemas/optimizer1.xml b/Yacs/Schemas/optimizer1.xml
index a63fcda8f1b6e7e30b68363d7c3f443d7130acb3..a30fe3ffb03d84a282c5621121dce329eb755786 100644 (file)
--- a/Yacs/Schemas/optimizer1.xml
+++ b/Yacs/Schemas/optimizer1.xml
@@ -27,7 +27,7 @@
       <inline name="node2" >
         <script >
             <code>p1= p1+10.</code>
-            <code>print "node2:",p1</code>
+            <code>print("node2:",p1)</code>
             <code>#a=p1/0</code>
             <code>p1=5</code>
         </script>

diff --git a/Yacs/Schemas/optimizer2.xml b/Yacs/Schemas/optimizer2.xml
index 6c9d5cfd26df61c8e3da0d39c679b7e6b5c8a0d3..8d2de65d5f54771ffc2846c1c3fc65d3308cfb8e 100644 (file)
--- a/Yacs/Schemas/optimizer2.xml
+++ b/Yacs/Schemas/optimizer2.xml
@@ -28,7 +28,7 @@
       <inline name="node2" >
         <script >
             <code>p1= p1+10.</code>
-            <code>print "node2:",p1</code>
+            <code>print("node2:",p1)</code>
             <code>#a=p1/0</code>
             <code>p1=5</code>
         </script>

diff --git a/Yacs/Schemas/pschema.xml b/Yacs/Schemas/pschema.xml
index c64d586fa35754ec6f56334ff7a874c6c722309d..f00674ed6d848fff72eeb704f1a453899ce98626 100644 (file)
--- a/Yacs/Schemas/pschema.xml
+++ b/Yacs/Schemas/pschema.xml
@@ -54,27 +54,27 @@
 
     <inline name="node1" >
         <script>
-            <code>print p1</code>
+            <code>print(p1)</code>
         </script>
         <inport name="p1" type="int"/>
     </inline>
     <inline name="node11" >
         <script>
-            <code>print p1</code>
+            <code>print(p1)</code>
         </script>
         <inport name="p1" type="string"/>
     </inline>
     <inline name="node12" >
         <script>
-            <code>print p1</code>
-            <code>print "coucou"</code>
+            <code>print(p1)</code>
+            <code>print("coucou")</code>
         </script>
         <inport name="p1" type="dblevec"/>
     </inline>
     <inline name="node13" >
         <script>
-            <code><![CDATA[print p1]]></code>
-            <code><![CDATA[print "coucou"]]> </code>
+            <code><![CDATA[print(p1)]]></code>
+            <code><![CDATA[print("coucou")]]> </code>
         </script>
         <inport name="p1" type="dblevecvec"/>
         <outport name="p1" type="dblevecvec"/>
@@ -112,10 +112,10 @@
         <script>
            <code>import eo</code>
            <code>obj=obj._narrow(eo.Echo)</code>
-           <code>print p1</code>
-           <code>print obj</code>
+           <code>print(p1)</code>
+           <code>print(obj)</code>
            <code>p2=obj.echoC(p1)</code>
-           <code>print p2</code>
+           <code>print(p2)</code>
         </script>
         <inport name="p1" type="C"/>
         <inport name="obj" type="Echo"/>
@@ -123,14 +123,14 @@
     </inline>
     <inline name="node34" >
         <script>
-        <code>print p1;p2=p1</code>
+        <code>print(p1);p2=p1</code>
         </script>
         <inport name="p1" type="C"/>
         <outport name="p2" type="C"/>
     </inline>
     <inline name="node35" >
         <script>
-        <code>print p1;p2=p1</code>
+        <code>print(p1);p2=p1</code>
         </script>
         <inport name="p1" type="C"/>
         <outport name="p2" type="C"/>

diff --git a/Yacs/Schemas/refcnt1.xml b/Yacs/Schemas/refcnt1.xml
index 84ba725fb7b585880183ba2ec7abc81d4ff1c4a1..6124fa7f2a1827e8e9210c0fd562a0ddd7d74f9d 100644 (file)
--- a/Yacs/Schemas/refcnt1.xml
+++ b/Yacs/Schemas/refcnt1.xml
@@ -28,7 +28,7 @@
       <code>def f(p1):</code> 
       <code>   global a</code> 
       <code>   a=a+1</code> 
-      <code>   print a</code> 
+      <code>   print(a)</code> 
       <code>   return p1</code> 
     </function>
     <inport name="p1" type="int"/>

diff --git a/Yacs/Schemas/schema2.xml b/Yacs/Schemas/schema2.xml
index cf2c204cd02a36f92357400eb6191586f77258fd..d6ac2f6d3ffeff94eb43995b3e3c46f8ef3acf78 100644 (file)
--- a/Yacs/Schemas/schema2.xml
+++ b/Yacs/Schemas/schema2.xml
@@ -57,27 +57,27 @@
 
     <inline name="node1" >
         <script>
-            <code>print p1</code>
+            <code>print(p1)</code>
         </script>
         <inport name="p1" type="int"/>
     </inline>
     <inline name="node11" >
         <script>
-            <code>print p1</code>
+            <code>print(p1)</code>
         </script>
         <inport name="p1" type="string"/>
     </inline>
     <inline name="node12" >
         <script>
-            <code>print p1</code>
-            <code>print "coucou"</code>
+            <code>print(p1)</code>
+            <code>print("coucou")</code>
         </script>
         <inport name="p1" type="dblevec"/>
     </inline>
     <inline name="node13" >
         <script>
-            <code><![CDATA[print p1]]></code>
-            <code><![CDATA[print "coucou"]]> </code>
+            <code><![CDATA[print(p1)]]></code>
+            <code><![CDATA[print("coucou")]]> </code>
         </script>
         <inport name="p1" type="dblevecvec"/>
         <outport name="p1" type="dblevecvec"/>
@@ -115,10 +115,10 @@
         <script>
            <code>import eo</code>
            <code>obj=obj._narrow(eo.Echo)</code>
-           <code>print p1</code>
-           <code>print obj</code>
+           <code>print(p1)</code>
+           <code>print(obj)</code>
            <code>p2=obj.echoC(p1)</code>
-           <code>print p2</code>
+           <code>print(p2)</code>
         </script>
         <inport name="p1" type="C"/>
         <inport name="obj" type="Echo"/>
@@ -126,14 +126,14 @@
     </inline>
     <inline name="node34" >
         <script>
-        <code>print p1;p2=p1</code>
+        <code>print(p1);p2=p1</code>
         </script>
         <inport name="p1" type="C"/>
         <outport name="p2" type="C"/>
     </inline>
     <inline name="node35" >
         <script>
-        <code>print p1;p2=p1</code>
+        <code>print(p1);p2=p1</code>
         </script>
         <inport name="p1" type="C"/>
         <outport name="p2" type="C"/>

diff --git a/Yacs/Schemas/sinline1.xml b/Yacs/Schemas/sinline1.xml
index 8d3595d251baf48e5626926b51f594fc886af4db..802dc6930a0e68b634994a3d5aaefdfd543f62f3 100644 (file)
--- a/Yacs/Schemas/sinline1.xml
+++ b/Yacs/Schemas/sinline1.xml
@@ -28,14 +28,14 @@
         <code>salome.salome_init()</code>
         <code>import PYHELLO_ORB</code>
         <code>def f(p1):</code>
-        <code>  print __container__from__YACS__</code>
+        <code>  print(__container__from__YACS__)</code>
         <code>  machine,container=__container__from__YACS__.split('/')</code>
         <code>  param={}</code>
         <code>  param['hostname']=machine</code>
         <code>  param['container_name']=container</code>
         <code>  compo=salome.lcc.LoadComponent(param, "PYHELLO")</code>
-        <code>  print compo.makeBanner(p1)</code>
-        <code>  print p1</code>
+        <code>  print(compo.makeBanner(p1))</code>
+        <code>  print(p1)</code>
       </function>
       <load container="A"/>
       <inport name="p1" type="string"/>
@@ -47,14 +47,14 @@
         <code>salome.salome_init()</code>
         <code>import HELLO_ORB</code>
         <code>def f(p1):</code>
-        <code>  print __container__from__YACS__</code>
+        <code>  print(__container__from__YACS__)</code>
         <code>  machine,container=__container__from__YACS__.split('/')</code>
         <code>  param={}</code>
         <code>  param['hostname']=machine</code>
         <code>  param['container_name']=container</code>
         <code>  compo=salome.lcc.LoadComponent(param, "HELLO")</code>
-        <code>  print compo.makeBanner(p1)</code>
-        <code>  print p1</code>
+        <code>  print(compo.makeBanner(p1))</code>
+        <code>  print(p1)</code>
       </function>
       <load container="A"/>
       <inport name="p1" type="string"/>
@@ -65,14 +65,14 @@
         <code>salome.salome_init()</code>
         <code>import PYHELLO_ORB</code>
         <code>def f(p1):</code>
-        <code>  print __container__from__YACS__</code>
+        <code>  print(__container__from__YACS__)</code>
         <code>  machine,container=__container__from__YACS__.split('/')</code>
         <code>  param={}</code>
         <code>  param['hostname']=machine</code>
         <code>  param['container_name']=container</code>
         <code>  compo=salome.lcc.LoadComponent(param, "PYHELLO")</code>
-        <code>  print compo.makeBanner(p1)</code>
-        <code>  print p1</code>
+        <code>  print(compo.makeBanner(p1))</code>
+        <code>  print(p1)</code>
       </function>
       <inport name="p1" type="string"/>
     </sinline>
@@ -83,14 +83,14 @@
         <code>salome.salome_init()</code>
         <code>import HELLO_ORB</code>
         <code>def f(p1):</code>
-        <code>  print __container__from__YACS__</code>
+        <code>  print(__container__from__YACS__)</code>
         <code>  machine,container=__container__from__YACS__.split('/')</code>
         <code>  param={}</code>
         <code>  param['hostname']=machine</code>
         <code>  param['container_name']=container</code>
         <code>  compo=salome.lcc.LoadComponent(param, "HELLO")</code>
-        <code>  print compo.makeBanner(p1)</code>
-        <code>  print p1</code>
+        <code>  print(compo.makeBanner(p1))</code>
+        <code>  print(p1)</code>
       </function>
       <inport name="p1" type="string"/>
     </sinline>

diff --git a/Yacs/Schemas/sinline2.xml b/Yacs/Schemas/sinline2.xml
index 5904b72a5deee912ca155bad570961932036a9e3..3c08b5a3b2748d9a4d8e7af496b9ce6ba81ac098 100644 (file)
--- a/Yacs/Schemas/sinline2.xml
+++ b/Yacs/Schemas/sinline2.xml
@@ -29,14 +29,14 @@
         <code>salome.salome_init()</code>
         <code>import PYHELLO_ORB</code>
         <code>def f(p1):</code>
-        <code>  print __container__from__YACS__</code>
+        <code>  print(__container__from__YACS__)</code>
         <code>  machine,container=__container__from__YACS__.split('/')</code>
         <code>  param={}</code>
         <code>  param['hostname']=machine</code>
         <code>  param['container_name']=container</code>
         <code>  compo=salome.lcc.LoadComponent(param, "PYHELLO")</code>
-        <code>  print compo.makeBanner(p1)</code>
-        <code>  print p1</code>
+        <code>  print(compo.makeBanner(p1))</code>
+        <code>  print(p1)</code>
       </function>
       <load container="A"/>
       <inport name="p1" type="string"/>

diff --git a/Yacs/Schemas/sinline3.xml b/Yacs/Schemas/sinline3.xml
index 9ccc3262969fdfd3f7cb5fef3a45f0cf24be7b39..eba746c12cdfe5dde6581f65e474d6b127cd9980 100644 (file)
--- a/Yacs/Schemas/sinline3.xml
+++ b/Yacs/Schemas/sinline3.xml
@@ -28,15 +28,15 @@
         <code>import salome</code>
         <code>salome.salome_init()</code>
         <code>import PYHELLO_ORB</code>
-        <code>print __container__from__YACS__</code>
+        <code>print(__container__from__YACS__)</code>
         <code>machine,container=__container__from__YACS__.split('/')</code>
         <code>param={}</code>
         <code>param['hostname']=machine</code>
         <code>param['container_name']=container</code>
         <code>compo=salome.lcc.LoadComponent(param, "PYHELLO")</code>
         <code>def f(p1):</code>
-        <code>  print compo.makeBanner(p1)</code>
-        <code>  print p1</code>
+        <code>  print(compo.makeBanner(p1))</code>
+        <code>  print(p1)</code>
       </function>
       <load container="A"/>
       <inport name="p1" type="string"/>

diff --git a/Yacs/Schemas/sinline4.xml b/Yacs/Schemas/sinline4.xml
index 9053eebb67f095fe0953fe56f08ade4fb10100d8..0ab11b8e5f27b044e61ab43563722fa8a16b0e86 100644 (file)
--- a/Yacs/Schemas/sinline4.xml
+++ b/Yacs/Schemas/sinline4.xml
@@ -30,14 +30,14 @@
         <code>salome.salome_init()</code>
         <code>import PYHELLO_ORB</code>
         <code>def f(p1):</code>
-        <code>  print __container__from__YACS__</code>
+        <code>  print(__container__from__YACS__)</code>
         <code>  machine,container=__container__from__YACS__.split('/')</code>
         <code>  param={}</code>
         <code>  param['hostname']=machine</code>
         <code>  param['container_name']=container</code>
         <code>  compo=salome.lcc.LoadComponent(param, "PYHELLO")</code>
-        <code>  print compo.makeBanner(p1)</code>
-        <code>  print p1</code>
+        <code>  print(compo.makeBanner(p1))</code>
+        <code>  print(p1)</code>
       </function>
       <load container="A"/>
       <inport name="p1" type="string"/>
@@ -49,14 +49,14 @@
         <code>salome.salome_init()</code>
         <code>import HELLO_ORB</code>
         <code>def f(p1):</code>
-        <code>  print __container__from__YACS__</code>
+        <code>  print(__container__from__YACS__)</code>
         <code>  machine,container=__container__from__YACS__.split('/')</code>
         <code>  param={}</code>
         <code>  param['hostname']=machine</code>
         <code>  param['container_name']=container</code>
         <code>  compo=salome.lcc.LoadComponent(param, "HELLO")</code>
-        <code>  print compo.makeBanner(p1)</code>
-        <code>  print p1</code>
+        <code>  print(compo.makeBanner(p1))</code>
+        <code>  print(p1)</code>
       </function>
       <load container="A"/>
       <inport name="p1" type="string"/>
@@ -67,14 +67,14 @@
         <code>salome.salome_init()</code>
         <code>import PYHELLO_ORB</code>
         <code>def f(p1):</code>
-        <code>  print __container__from__YACS__</code>
+        <code>  print(__container__from__YACS__)</code>
         <code>  machine,container=__container__from__YACS__.split('/')</code>
         <code>  param={}</code>
         <code>  param['hostname']=machine</code>
         <code>  param['container_name']=container</code>
         <code>  compo=salome.lcc.LoadComponent(param, "PYHELLO")</code>
-        <code>  print compo.makeBanner(p1)</code>
-        <code>  print p1</code>
+        <code>  print(compo.makeBanner(p1))</code>
+        <code>  print(p1)</code>
       </function>
       <inport name="p1" type="string"/>
     </sinline>
@@ -85,14 +85,14 @@
         <code>salome.salome_init()</code>
         <code>import HELLO_ORB</code>
         <code>def f(p1):</code>
-        <code>  print __container__from__YACS__</code>
+        <code>  print(__container__from__YACS__)</code>
         <code>  machine,container=__container__from__YACS__.split('/')</code>
         <code>  param={}</code>
         <code>  param['hostname']=machine</code>
         <code>  param['container_name']=container</code>
         <code>  compo=salome.lcc.LoadComponent(param, "HELLO")</code>
-        <code>  print compo.makeBanner(p1)</code>
-        <code>  print p1</code>
+        <code>  print(compo.makeBanner(p1))</code>
+        <code>  print(p1)</code>
       </function>
       <inport name="p1" type="string"/>
     </sinline>

diff --git a/Yacs/Schemas/sinline5.xml b/Yacs/Schemas/sinline5.xml
index d9bf547c9de1d3c1a10bbdadc538072f59e0d167..d8e6d1e7c3b09d58a53873c84eda8672bbf41ca1 100644 (file)
--- a/Yacs/Schemas/sinline5.xml
+++ b/Yacs/Schemas/sinline5.xml
@@ -40,15 +40,15 @@
           <code>import salome</code>
           <code>salome.salome_init()</code>
           <code>import PYHELLO_ORB</code>
-          <code>print __container__from__YACS__</code>
+          <code>print(__container__from__YACS__)</code>
           <code>machine,container=__container__from__YACS__.split('/')</code>
           <code>param={}</code>
           <code>param['hostname']=machine</code>
           <code>param['container_name']=container</code>
           <code>compo=salome.lcc.LoadComponent(param, "PYHELLO")</code>
           <code>def f(p1):</code>
-          <code>  print compo.makeBanner(p1)</code>
-          <code>  print p1</code>
+          <code>  print(compo.makeBanner(p1))</code>
+          <code>  print(p1)</code>
           <code>  return p1</code>
         </function>
         <load container="A"/>
@@ -58,7 +58,7 @@
     </foreach>
     <inline name="node1" >
       <script>
-        <code>print p1</code>
+        <code>print(p1)</code>
       </script>
       <inport name="p1" type="strvec"/>
     </inline>

diff --git a/Yacs/Schemas/string1.xml b/Yacs/Schemas/string1.xml
index edaa65e80f19f022ff5ec9bd24fbb18551c218ce..2807a5792596259cd88ba6c3ea6a47c2ac20e23b 100644 (file)
--- a/Yacs/Schemas/string1.xml
+++ b/Yacs/Schemas/string1.xml
@@ -125,7 +125,7 @@
 
     <inline name="pyth5" >
       <script>
-        <code>print p1</code>
+        <code>print(p1)</code>
       </script>
       <inport name="p1" type="strvec"/>
       <outport name="p1" type="strvec"/>
@@ -146,7 +146,7 @@
 
     <inline name="pyth6" >
       <script>
-        <code>print p1</code>
+        <code>print(p1)</code>
       </script>
       <inport name="p1" type="strvec"/>
       <outport name="p1" type="strvec"/>

diff --git a/Yacs/Schemas/struct1.xml b/Yacs/Schemas/struct1.xml
index e76c7224c6130e56ea5df21fdf5241923ba93acb..ac734fac95c5f2b478e14f9d4c7664467a99b511 100644 (file)
--- a/Yacs/Schemas/struct1.xml
+++ b/Yacs/Schemas/struct1.xml
@@ -64,14 +64,14 @@
 
     <inline name="pyth3" >
       <script>
-        <code>print s1</code>
+        <code>print(s1)</code>
       </script>
       <inport name="s1" type="eo/S2"/>
     </inline>
 
     <inline name="pyth9" >
       <script>
-        <code>print s1</code>
+        <code>print(s1)</code>
       </script>
       <inport name="s1" type="eo/S2"/>
     </inline>
@@ -92,15 +92,15 @@
 
     <inline name="pyth2" >
       <script>
-        <code>print s1</code>
+        <code>print(s1)</code>
       </script>
       <inport name="s1" type="eo/S2"/>
     </inline>
 
     <inline name="pyth0" >
       <script>
-        <code>print s1</code>
-        <code>print t1</code>
+        <code>print(s1)</code>
+        <code>print(t1)</code>
       </script>
       <inport name="p1" type="double"/>
       <inport name="s1" type="eo/S2"/>
@@ -125,7 +125,7 @@
 
     <inline name="pyth6" >
       <script>
-        <code>print p1</code>
+        <code>print(p1)</code>
       </script>
       <inport name="p1" type="dblevec"/>
       <outport name="p1" type="dblevec"/>

diff --git a/Yacs/Schemas/study1.xml b/Yacs/Schemas/study1.xml
index 43098c91e77303bdf8b69c45ff75dda231104f0c..e9da9077f2708b8f55b810bd8910298e6b2efe79 100644 (file)
--- a/Yacs/Schemas/study1.xml
+++ b/Yacs/Schemas/study1.xml
@@ -38,7 +38,7 @@
       <script>
         <code>import GEOM</code>
         <code>p1=p1._narrow(GEOM.GEOM_Object)</code>
-        <code>print p1</code>
+        <code>print(p1)</code>
       </script>
       <inport name="p1" type="GEOM/GEOM_Object"/>
       <outport name="p1" type="GEOM/GEOM_Object"/>

diff --git a/Yacs/Schemas/switch1.xml b/Yacs/Schemas/switch1.xml
index 4a2c6bfb438af9aa237e440ea2b03cc5136f2965..1fe47d33f0914a0419c60b87228d232393e3c8e8 100644 (file)
--- a/Yacs/Schemas/switch1.xml
+++ b/Yacs/Schemas/switch1.xml
@@ -26,21 +26,21 @@
     <switch name="b1" select="3" >
       <case id="1">
         <inline name="n2" >
-          <script><code>print p1</code></script>
+          <script><code>print(p1)</code></script>
           <inport name="p1" type="double"/>
           <outport name="p1" type="double"/>
         </inline>
       </case>
       <case id="3">
         <inline name="n2" >
-          <script><code>print p1</code></script>
+          <script><code>print(p1)</code></script>
           <inport name="p1" type="double"/>
           <outport name="p1" type="double"/>
         </inline>
       </case>
       <default>
         <inline name="n2" >
-          <script><code>print p1</code></script>
+          <script><code>print(p1)</code></script>
           <inport name="p1" type="double"/>
           <outport name="p1" type="double"/>
         </inline>

diff --git a/Yacs/Schemas/switch2.xml b/Yacs/Schemas/switch2.xml
index 4d3aa7bbc67c954de88fb2761e0779faac91bcb6..1dd6ab9c60b4462ea428bd30715863e2d70678f6 100644 (file)
--- a/Yacs/Schemas/switch2.xml
+++ b/Yacs/Schemas/switch2.xml
@@ -26,21 +26,21 @@
     <switch name="b1">
       <case id="1">
         <inline name="n2" >
-          <script><code>print p1</code></script>
+          <script><code>print(p1)</code></script>
           <inport name="p1" type="double"/>
           <outport name="p1" type="double"/>
         </inline>
       </case>
       <case id="3">
         <inline name="n2" >
-          <script><code>print p1</code></script>
+          <script><code>print(p1)</code></script>
           <inport name="p1" type="double"/>
           <outport name="p1" type="double"/>
         </inline>
       </case>
       <default>
         <inline name="n2" >
-          <script><code>print p1</code></script>
+          <script><code>print(p1)</code></script>
           <inport name="p1" type="double"/>
           <outport name="p1" type="double"/>
         </inline>

diff --git a/Yacs/Schemas/switch3.xml b/Yacs/Schemas/switch3.xml
index 22672c5bc10b790587d3c5654277e904f0b111cd..a72ca8d03b3ac74fc2b6081d3d2d3736088a119f 100644 (file)
--- a/Yacs/Schemas/switch3.xml
+++ b/Yacs/Schemas/switch3.xml
@@ -32,21 +32,21 @@
     <switch name="b1">
       <case id="1">
         <inline name="n2" >
-          <script><code>print p1</code></script>
+          <script><code>print(p1)</code></script>
           <inport name="p1" type="double"/>
           <outport name="p1" type="double"/>
         </inline>
       </case>
       <case id="3">
         <inline name="n2" >
-          <script><code>print p1</code></script>
+          <script><code>print(p1)</code></script>
           <inport name="p1" type="double"/>
           <outport name="p1" type="double"/>
         </inline>
       </case>
       <default>
         <inline name="n2" >
-          <script><code>print p1</code></script>
+          <script><code>print(p1)</code></script>
           <inport name="p1" type="double"/>
           <outport name="p1" type="double"/>
         </inline>

diff --git a/Yacs/Schemas/switch4.xml b/Yacs/Schemas/switch4.xml
index 9ba061a1dc15630c4272902d4d03a42395bc9925..960c63d8650f4eff5739089399b7e98e91cab0ce 100644 (file)
--- a/Yacs/Schemas/switch4.xml
+++ b/Yacs/Schemas/switch4.xml
@@ -32,7 +32,7 @@
     </inline>
     <inline name="n2" >
         <script>
-            <code>print p1</code>
+            <code>print(p1)</code>
         </script>
         <inport name="p1" type="double"/>
         <outport name="p1" type="double"/>
@@ -40,21 +40,21 @@
     <switch name="b1">
       <case id="1">
         <inline name="n2" >
-          <script><code>print p1</code></script>
+          <script><code>print(p1)</code></script>
           <inport name="p1" type="double"/>
           <outport name="p1" type="double"/>
         </inline>
       </case>
       <case id="3">
         <inline name="n2" >
-          <script><code>print p1</code></script>
+          <script><code>print(p1)</code></script>
           <inport name="p1" type="double"/>
           <outport name="p1" type="double"/>
         </inline>
       </case>
       <default>
         <inline name="n2" >
-          <script><code>print p1</code></script>
+          <script><code>print(p1)</code></script>
           <inport name="p1" type="double"/>
           <outport name="p1" type="double"/>
         </inline>

diff --git a/Yacs/Schemas/switch5.xml b/Yacs/Schemas/switch5.xml
index c2a34abe10e1ef24bd2301f38f0ac72141778ec3..badfb00c4b955080ccd6dfd6d9d9c785de37f4f5 100644 (file)
--- a/Yacs/Schemas/switch5.xml
+++ b/Yacs/Schemas/switch5.xml
@@ -32,7 +32,7 @@
     </inline>
     <inline name="n2" >
         <script>
-            <code>print p1</code>
+            <code>print(p1)</code>
         </script>
         <inport name="p1" type="double"/>
         <outport name="p1" type="double"/>
@@ -40,7 +40,7 @@
     <switch name="b1">
       <case id="1">
         <inline name="n2" >
-          <script><code>print p1</code></script>
+          <script><code>print(p1)</code></script>
           <inport name="p1" type="double"/>
           <outport name="p1" type="double"/>
         </inline>
@@ -48,7 +48,7 @@
       <case id="3">
         <bloc name="b">
           <inline name="n2" >
-            <script><code>print p1</code></script>
+            <script><code>print(p1)</code></script>
             <inport name="p1" type="double"/>
             <outport name="p1" type="double"/>
           </inline>
@@ -56,7 +56,7 @@
       </case>
       <default>
         <inline name="n2" >
-          <script><code>print p1</code></script>
+          <script><code>print(p1)</code></script>
           <inport name="p1" type="double"/>
           <outport name="p1" type="double"/>
         </inline>

diff --git a/Yacs/Schemas/switch6.xml b/Yacs/Schemas/switch6.xml
index e019da84b06663858f18df863b45a33d3e73fbfd..36c0ca82b7fa8acfe812c46e3fecdb781b00d1d4 100644 (file)
--- a/Yacs/Schemas/switch6.xml
+++ b/Yacs/Schemas/switch6.xml
@@ -31,7 +31,7 @@
     </inline>
     <inline name="n2" >
         <script>
-            <code>print p1</code>
+            <code>print(p1)</code>
         </script>
         <inport name="p1" type="double"/>
         <outport name="p1" type="double"/>
@@ -40,21 +40,21 @@
     <switch name="b1">
       <case id="1">
         <inline name="n2" >
-          <script><code>print p1</code></script>
+          <script><code>print(p1)</code></script>
           <inport name="p1" type="double"/>
           <outport name="p1" type="double"/>
         </inline>
       </case>
       <case id="3">
           <inline name="n2" >
-            <script><code>print p1</code></script>
+            <script><code>print(p1)</code></script>
             <inport name="p1" type="double"/>
             <outport name="p1" type="double"/>
           </inline>
       </case>
       <default>
         <inline name="n2" >
-          <script><code>print p1</code></script>
+          <script><code>print(p1)</code></script>
           <inport name="p1" type="double"/>
           <outport name="p1" type="double"/>
         </inline>

diff --git a/Yacs/Schemas/switch7.xml b/Yacs/Schemas/switch7.xml
index b3429485fd86c463b8d3a78a877018287805d5a0..380bf340626931102dcf4b78e3a174df01516161 100644 (file)
--- a/Yacs/Schemas/switch7.xml
+++ b/Yacs/Schemas/switch7.xml
@@ -31,7 +31,7 @@
     </inline>
     <inline name="n2" >
         <script>
-            <code>print p1</code>
+            <code>print(p1)</code>
         </script>
         <inport name="p1" type="double"/>
         <outport name="p1" type="double"/>
@@ -39,7 +39,7 @@
     <switch name="b1">
       <case id="1">
         <inline name="n2" >
-          <script><code>print p1</code></script>
+          <script><code>print(p1)</code></script>
           <inport name="p1" type="double"/>
           <outport name="p1" type="double"/>
         </inline>
@@ -47,7 +47,7 @@
       <case id="3">
         <forloop name="b" nsteps="2">
           <inline name="n2" >
-            <script><code>print p1</code></script>
+            <script><code>print(p1)</code></script>
             <inport name="p1" type="double"/>
             <outport name="p1" type="double"/>
           </inline>
@@ -55,7 +55,7 @@
       </case>
       <default>
         <inline name="n2" >
-          <script><code>print p1</code></script>
+          <script><code>print(p1)</code></script>
           <inport name="p1" type="double"/>
           <outport name="p1" type="double"/>
         </inline>

diff --git a/Yacs/Schemas/switch8.xml b/Yacs/Schemas/switch8.xml
index 5105edb1d2cb17b3b334091bb774bd9eea32700a..bd54ed50aaefb1e27d076c785d0b5253c2d354f2 100644 (file)
--- a/Yacs/Schemas/switch8.xml
+++ b/Yacs/Schemas/switch8.xml
@@ -31,7 +31,7 @@
     </inline>
     <inline name="n2" >
         <script>
-            <code>print p1</code>
+            <code>print(p1)</code>
         </script>
         <inport name="p1" type="double"/>
         <outport name="p1" type="double"/>
@@ -39,7 +39,7 @@
     <switch name="b1">
       <case id="1">
         <inline name="n2" >
-          <script><code>print p1</code></script>
+          <script><code>print(p1)</code></script>
           <inport name="p1" type="double"/>
           <outport name="p1" type="double"/>
         </inline>
@@ -48,7 +48,7 @@
         <while name="b" >
           <inline name="n2" >
               <script>
-                  <code>print p1</code>
+                  <code>print(p1)</code>
                   <code>p1=p1+20</code>
                   <code><![CDATA[condition=p1 < 90.]]> </code>
               </script>
@@ -64,7 +64,7 @@
       </case>
       <default>
         <inline name="n2" >
-          <script><code>print p1</code></script>
+          <script><code>print(p1)</code></script>
           <inport name="p1" type="double"/>
           <outport name="p1" type="double"/>
         </inline>

diff --git a/Yacs/Schemas/switch9.xml b/Yacs/Schemas/switch9.xml
index 5ba11af87680a33b4b050d1e027bb2c6f7c1c841..95cca171f6ef5fd89eff94e9b579badc07bf0f33 100644 (file)
--- a/Yacs/Schemas/switch9.xml
+++ b/Yacs/Schemas/switch9.xml
@@ -29,7 +29,7 @@
     </inline>
     <inline name="n2" >
         <script>
-            <code>print p1</code>
+            <code>print(p1)</code>
         </script>
         <inport name="p1" type="double"/>
         <outport name="p1" type="double"/>
@@ -37,7 +37,7 @@
     <switch name="b1">
       <case id="1">
         <inline name="n2" >
-          <script><code>print p1</code></script>
+          <script><code>print(p1)</code></script>
           <inport name="p1" type="double"/>
           <outport name="p1" type="double"/>
         </inline>
@@ -47,7 +47,7 @@
           <case id="1">
             <inline name="n2" >
               <script>
-                  <code>print p1</code>
+                  <code>print(p1)</code>
                   <code>p1=p1+20</code>
                   <code><![CDATA[condition=p1 < 40.]]> </code>
               </script>
@@ -70,7 +70,7 @@
       </case>
       <default>
         <inline name="n2" >
-          <script><code>print p1</code></script>
+          <script><code>print(p1)</code></script>
           <inport name="p1" type="double"/>
           <outport name="p1" type="double"/>
         </inline>

diff --git a/Yacs/Schemas/triangle5error.xml b/Yacs/Schemas/triangle5error.xml
index 79498b1cd3e08202bf3b9f87194350f88b1afe3d..4cee96965a9519cfe69e253c6227f1b1b68d20b1 100644 (file)
--- a/Yacs/Schemas/triangle5error.xml
+++ b/Yacs/Schemas/triangle5error.xml
@@ -26,7 +26,7 @@
 <inline name="node_0_0" >
 <script><code>
 c=a+b
-print c
+print(c)
 </code></script>
 <inport name="a" type="int"/>
 <inport name="b" type="int"/>
@@ -43,7 +43,7 @@ print c
 <inline name="node_3_0" >
 <script><code>
 c=a+b/0
-print c
+print(c)
 </code></script>
 <inport name="a" type="int"/>
 <inport name="b" type="int"/>

diff --git a/Yacs/Schemas/while1.xml b/Yacs/Schemas/while1.xml
index 84aadb1be9c3e07d11eafd3130d7ed4172cd6431..8e39165c1f152799a8f99c8f2ca6831a867c57b7 100644 (file)
--- a/Yacs/Schemas/while1.xml
+++ b/Yacs/Schemas/while1.xml
@@ -37,9 +37,9 @@
             <code>def f(p1):</code>
             <code>  global a</code>
             <code>  p1= p1+10.</code>
-            <code>  print a</code>
+            <code>  print(a)</code>
             <code>  a=a+p1</code>
-            <code>  print "p1:",p1</code>
+            <code>  print("p1:",p1)</code>
             <code><![CDATA[  condition=p1 < 40.]]> </code>
             <code>  return p1,condition</code>
         </function>

diff --git a/Yacs/Schemas/while2.xml b/Yacs/Schemas/while2.xml
index c848f1baceee35af6a9598069cb0a347a827d76e..7781b014526adf50a29642f29c10ca4b6ea6f0db 100644 (file)
--- a/Yacs/Schemas/while2.xml
+++ b/Yacs/Schemas/while2.xml
@@ -38,9 +38,9 @@
             <code><![CDATA[def f(p1):]]> </code>
             <code><![CDATA[  global a]]> </code>
             <code><![CDATA[  p1= p1+10.]]> </code>
-            <code><![CDATA[  print a]]> </code>
+            <code><![CDATA[  print(a)]]> </code>
             <code><![CDATA[  a=a+p1]]> </code>
-            <code><![CDATA[  print "a:",a]]> </code>
+            <code><![CDATA[  print( "a:",a)]]> </code>
             <code><![CDATA[  condition=p1 < 50.]]> </code>
             <code><![CDATA[  return p1,condition]]> </code>
           </function>

diff --git a/Yacs/Schemas/while3.xml b/Yacs/Schemas/while3.xml
index 6042c03a5d4bef3dc9d834a003d1b456bd31d600..6b11f0514f8d247e828db7e964f9e87119da341f 100644 (file)
--- a/Yacs/Schemas/while3.xml
+++ b/Yacs/Schemas/while3.xml
@@ -38,9 +38,9 @@
             <code>def f(p1):</code>
             <code>  global a</code>
             <code>  p1= p1+10.</code>
-            <code>  print a</code>
+            <code>  print(a)</code>
             <code>  a=a+p1</code>
-            <code>  print "p1:",p1</code>
+            <code>  print("p1:",p1)</code>
             <code><![CDATA[  condition=p1 < 40.]]> </code>
             <code>  return p1,condition</code>
         </function>