[PY3] 2to3 -w -n results

[modules/yacs.git] / src / yacsloader / Test / genTriangle.py

diff --git a/src/yacsloader/Test/genTriangle.py b/src/yacsloader/Test/genTriangle.py
index d3e45b9c64cc0c1f5fe4ff2599584239e24a7eaf..4570fd13cef4f956678023075830a3023e3c834d 100644 (file)
--- a/src/yacsloader/Test/genTriangle.py
+++ b/src/yacsloader/Test/genTriangle.py
@@ -45,43 +45,43 @@ def triangle(n):
     The last node gives the sum of rank n (=2**n) and also a direct calculation of 2**n.
     """
     
-    print debut
+    print(debut)
     
-    print """
+    print("""
 <inline name="collect" >
-<script><code>"""
-    print "tot = 0"
-    print "for i in range (" + str(n+1) + "):"
-    print "    v='a' + str(i)"
-    print "    tot+=eval(v)"
-    print "result=tot"
-    print "print result"
-    print "reference=2**" + str(n)
-    print "print reference"
-    print "</code></script>"
+<script><code>""")
+    print("tot = 0")
+    print("for i in range (" + str(n+1) + "):")
+    print("    v='a' + str(i)")
+    print("    tot+=eval(v)")
+    print("result=tot")
+    print("print result")
+    print("reference=2**" + str(n))
+    print("print reference")
+    print("</code></script>")
     for i in range (n+1):
         inport='<inport name="a' + str(i) + '" type="int"/>'
-        print inport
+        print(inport)
         pass
-    print '<outport name="result" type="int"/>'
-    print '<outport name="reference" type="int"/>'
-    print "</inline>"
-    print
+    print('<outport name="result" type="int"/>')
+    print('<outport name="reference" type="int"/>')
+    print("</inline>")
+    print()
     
     for i in range (1,n+1):
         for j in range (i+1):
             node="node_" + str(i)   +"_" + str(j)
             nodetxt='<node name="'+node+'" type="node_0_0"></node>'
-            print nodetxt
+            print(nodetxt)
             pass
         pass
 
-    print """
+    print("""
 
     <!-- service -->
     <!-- control -->
 
-    """
+    """)
     
     for i in range (n):
         for j in range (i+1):
@@ -90,16 +90,16 @@ def triangle(n):
             tonode2="node_" + str(i+1)   +"_" + str(j+1)
             control1='<control> <fromnode>'+fromnode+'</fromnode> <tonode>'+tonode1+'</tonode> </control>'
             control2='<control> <fromnode>'+fromnode+'</fromnode> <tonode>'+tonode2+'</tonode> </control>'
-            print control1
-            print control2
+            print(control1)
+            print(control2)
             pass
         pass
 
-    print """
+    print("""
 
     <!-- datalinks -->
 
-    """
+    """)
     
     for i in range (n):
         for j in range (i+1):
@@ -109,14 +109,14 @@ def triangle(n):
             datafrom='<fromnode>' + fromnode + '</fromnode> <fromport>c</fromport>'
             datato1 ='<tonode>'   + tonode1  + '</tonode> <toport>b</toport>'
             datato2 ='<tonode>'   + tonode2  + '</tonode> <toport>a</toport>'
-            print '<datalink>'
-            print '   ' + datafrom
-            print '   ' + datato1
-            print '</datalink>'
-            print '<datalink>'
-            print '   ' + datafrom
-            print '   ' + datato2
-            print '</datalink>'
+            print('<datalink>')
+            print('   ' + datafrom)
+            print('   ' + datato1)
+            print('</datalink>')
+            print('<datalink>')
+            print('   ' + datafrom)
+            print('   ' + datato2)
+            print('</datalink>')
             pass
         pass
 
@@ -125,18 +125,18 @@ def triangle(n):
         datafrom='<fromnode>' + fromnode + '</fromnode> <fromport>c</fromport>'
         toport='a' + str(i)
         datato  ='<tonode>collect</tonode> <toport>' + toport + '</toport>'
-        print '<datalink>'
-        print '   ' + datafrom
-        print '   ' + datato
-        print '</datalink>'
+        print('<datalink>')
+        print('   ' + datafrom)
+        print('   ' + datato)
+        print('</datalink>')
     
-    print """
+    print("""
 
     <!--parameters -->
 
-    """
+    """)
 
-    print """
+    print("""
     <parameter>
         <tonode>node_0_0</tonode> <toport>a</toport>
         <value><int>0</int></value>
@@ -145,27 +145,27 @@ def triangle(n):
         <tonode>node_0_0</tonode> <toport>b</toport>
         <value><int>1</int></value>
     </parameter>
-    """
+    """)
 
     for i in range (1,n+1):
         node1="node_" + str(i)   +"_" + str(0)
         node2="node_" + str(i)   +"_" + str(i)
         tonode1 ='   <tonode>' + node1 + '</tonode> <toport>a</toport>'
         tonode2 ='   <tonode>' + node2 + '</tonode> <toport>b</toport>'
-        print '<parameter>'
-        print tonode1
-        print '   <value><int>0</int></value>'
-        print '</parameter>'
+        print('<parameter>')
+        print(tonode1)
+        print('   <value><int>0</int></value>')
+        print('</parameter>')
         
-        print '<parameter>'
-        print tonode2
-        print '   <value><int>0</int></value>'
-        print '</parameter>'
+        print('<parameter>')
+        print(tonode2)
+        print('   <value><int>0</int></value>')
+        print('</parameter>')
 
-    print """
+    print("""
 
 </proc>
-    """
+    """)
      
 if __name__ == "__main__":
     import sys
@@ -179,7 +179,7 @@ if __name__ == "__main__":
         if rank >31:
             raise ValueError("rank must be <32")
     except (IndexError, ValueError):
-        print usage%(sys.argv[0])
+        print(usage%(sys.argv[0]))
         sys.exit(1)
         pass
     triangle(rank)