Changeset d083cc

Timestamp:

Jan 24, 2024, 12:09:57 AM (21 months ago)

Author:

Frederik Heber <frederik.heber@…>

Branches:

Candidate_v1.7.0, stable

Children:

5a479d

Parents:

6dde30

git-author:

Frederik Heber <frederik.heber@…> (01/24/24 00:09:17)

git-committer:

Frederik Heber <frederik.heber@…> (01/24/24 00:09:57)

Message:

Python3: Test/Python changed.

• print -> print()

Location:

tests/Python

Files:

• AllActions/moltest.py (modified) (4 diffs)
• AllActions/moltest_check.py (modified) (3 diffs)
• AllActions/testsuite-python-allactions.at (modified) (1 diff)
• ForceAnnealing/pre/ising_model_chain.py (modified) (6 diffs)

tests/Python/AllActions/moltest.py

@@ -27 +27 @@
               key, value = line.split('\t', 1)
             except ValueError:
-              print "line needs two values, tab-separated: "+line
+              print("line needs two values, tab-separated: "+line)
               sys.exit(1)
             value = value[1:-2] # quotes entfernen
@@ -46 +46 @@
             
             if not param in Defaults:
-                print 'Fehlender Defaultwert:', param
+                print('Fehlender Defaultwert:', param)
         
         # direkt substituieren, oder erst beim aufruf?
@@ -59 +59 @@
 params = ParseParameters(doc)
 
-print '--BEGIN-- %s mit %s --------' % (cmd, params)
+print('--BEGIN-- %s mit %s --------' % (cmd, params))
    
 # write command to file
@@ -66 +66 @@
 output.close()
 # call python externally on this file and catch retcode
-p = subprocess.Popen(["python", "test.py"], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+p = subprocess.Popen(["python3", "test.py"], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
 stdout, stderr = p.communicate()
-print ' --- STDOUT ---'
-print ' %s ' % (stdout)
-print ' --- STDERR ---'
-print ' %s ' % (stderr)
+print(' --- STDOUT ---')
+print(' %s ' % (stdout))
+print(' --- STDERR ---')
+print(' %s ' % (stderr))
 retcode = p.returncode
 if retcode == 134 or retcode == 0:
-  print ' ---- ok ----'
+  print(' ---- ok ----')
 else:
-  print ' -- FAILED with %s --' % (retcode)
+  print(' -- FAILED with %s --' % (retcode))
 #  if retcode == 1:
 #    sys.exit(1)
 #exec('mol.%s(*params)' % cmd)
 
-print '---END--- %s mit %s --------' % (cmd, params)
+print('---END--- %s mit %s --------' % (cmd, params))
 
 sys.exit(0)

tests/Python/AllActions/moltest_check.py

@@ -14 +14 @@
               key, value = line.split('\t', 1)
             except ValueError:
-              print "line needs two values, tab-separated: "+line
+              print("line needs two values, tab-separated: "+line)
               sys.exit(1)
             value = value[1:-2] # remove quotes
@@ -31 +31 @@
             
             if not param in Defaults:
-                print >> sys.stderr, param # write missing default value to stderr
+                print(param, file=sys.stderr) # write missing default value to stderr
                 result = 1
 
@@ -39 +39 @@
 
 for cmd in cmds:
-    print "Checking on %s" % cmd
+    print("Checking on %s" % cmd)
     doc = eval('mol.%s.__doc__' % cmd)
     if CheckParameters(doc) == 1:

tests/Python/AllActions/testsuite-python-allactions.at

@@ -23 +23 @@
 AT_DATA([test.py], [
 import pyMoleCuilder as mol
-print mol.ThisCommandIsNotPresent()
+print(mol.ThisCommandIsNotPresent())
 ])
 AT_CHECK([../../run test.py], 1, [ignore], [stderr])
-AT_CHECK([fgrep "object has no attribute" stderr], 0, [ignore], [ignore])
+AT_CHECK([fgrep "has no attribute" stderr], 0, [ignore], [ignore])
 AT_CHECK([../../run ${abs_top_srcdir}/tests/Python/AllActions/listcmds.py], 0, [stdout], [ignore])
 AT_CHECK([/bin/cp -f ${abs_top_srcdir}/tests/Python/AllActions/options.dat .],  0, [ignore], [ignore])

tests/Python/ForceAnnealing/pre/ising_model_chain.py

@@ -8 +8 @@
 
 if len(sys.argv) < 5:
-        print 'Usage: '+sys.argv[0]+' <input> <path> <steps> <no_atoms> <use bondgraph>'
+        print('Usage: '+sys.argv[0]+' <input> <path> <steps> <no_atoms> <use bondgraph>')
         sys.exit(1)
 
@@ -21 +21 @@
 # creating input file
 atomstart=7.6-1.6*math.floor(no_atoms/2)
-print "Creating "+inputfile
+print("Creating "+inputfile)
 with open(inputfile, 'w') as f:
         f.write("# ATOMDATA\ttype\tId\tx=3\tu=3\tF=3\tneighbors=4\n")
@@ -36 +36 @@
                         f.write("C\t%d\t%lg\t10\t10\t0\t0\t0\t0\t0\t0\t%d\t%d\t0\t0\n" % (i, atompos, i-1, i+1));
 
-print "Parsing from "+inputfile
+print("Parsing from "+inputfile)
 mol.WorldInput(inputfile)
 mol.SelectionAllAtoms()
@@ -53 +53 @@
         print("Roots of p "+str(p)+" are "+str(zeros))
         damping=numpy.real(zeros[-1])
-        print "Using damping factor of "+str(damping)
+        print("Using damping factor of "+str(damping))
 else:
         if no_atoms == 2:
@@ -82 +82 @@
                                         continue
                                 line=line.replace('\t',' ')
-                                print "LINE: "+line
+                                print("LINE: "+line)
                                 [elementtype, X, Y, Z] = line.split(' ', 4)
                                 if coords!=[0.,0.,0.]:
@@ -88 +88 @@
                                 coords=[float(X),float(Y),float(Z)]
         except IOError:
-                print 'Warning: '+outputfile+' not readable.'
+                print('Warning: '+outputfile+' not readable.')
                 sys.exit(1)