new test format py2/3

Author: bgoli

run_sbml_test_suite_tests.py renamed to run-sbml-test-suite-tests.py

@@ -18,21 +18,21 @@
     os.makedirs(outDir)
 
 tests = os.listdir(testDir)
-print tests
+print(tests)
 
 for T in tests:
     retcode = subprocess.call([os.sys.executable, 'run_single_fbc_test.py', testDir, T, outDir])
 
 testResults = []
 for T in tests:
-    rF = file(os.path.join(testDir, T, '%s-results.csv' % T), 'r')
+    rF = open(os.path.join(testDir, T, '%s-results.csv' % T), 'r')
     r0 = rF.read().strip()
     r0 = [a.split(',') for a in r0.split('\n')]
     r00 = {}
     for j_ in range(len(r0[0])):
         r00[r0[0][j_]] = r0[1][j_]
     rF.close()
-    rF2 = file(os.path.join(outDir, '%s.csv' % T), 'r')
+    rF2 = open(os.path.join(outDir, '%s.csv' % T), 'r')
     r1 = rF2.read().strip()
     r1 = [a.split(',') for a in r1.split('\n')]
     r11 = {}
@@ -46,6 +46,6 @@
                 testRes = 'pass'
     testResults.append((T, testRes))
 
-print '\n\nFBC Test Suite Results:\n===================='
+print('\n\nFBC Test Suite Results:\n====================')
 for t_ in testResults:
-    print 'Test %s: %s' % (t_[0], t_[1])
+    print('Test %s: %s' % (t_[0], t_[1]))

sbml_test_suite/run_all_tests.py

@@ -2,7 +2,7 @@
 cDir = os.path.dirname(os.path.abspath(os.sys.argv[0]))
 import cbmpy as cbm
 
-print os.sys.argv
+print(os.sys.argv)
 
 mBase = os.sys.argv[2]
 testDir = os.path.join(os.sys.argv[1], mBase)
@@ -16,7 +16,7 @@
 ## cbm.CBSolver.glpk_analyzeModel(cmod)
 cbm.CBSolver.analyzeModel(cmod)
 
-F = file(os.path.join(testDir, '%s-settings.txt' % mBase), 'r')
+F = open(os.path.join(testDir, '%s-settings.txt' % mBase), 'r')
 variables = None
 for l_ in F:
     if l_.startswith('variables:'):
@@ -32,7 +32,7 @@
         data.append(cmod.getReaction(v_).getValue())
 #print data
 
-F = file(os.path.join(outDir, mBase)+'.csv', 'w')
+F = open(os.path.join(outDir, mBase)+'.csv', 'w')
 out = ''
 for v_ in variables:
     out += '%s,' % v_