2to3.py runned for print & except

Author: eino-makitalo

test/resources/statuschecker.py

@@ -177,14 +177,14 @@ def _get_log_message(self, msg_str):
     import os
 
     if not 2 <= len(sys.argv) <= 3 or '--help' in sys.argv:
-        print __doc__
+        print(__doc__)
         sys.exit(1)
     infile = sys.argv[1]
     outfile = sys.argv[2] if len(sys.argv) == 3 else None
-    print  "Checking %s" % os.path.abspath(infile)
+    print("Checking %s" % os.path.abspath(infile))
     rc = process_output(infile, outfile)
     if outfile:
-        print "Output: %s" % os.path.abspath(outfile)
+        print("Output: %s" % os.path.abspath(outfile))
     if rc > 255:
         rc = 255
     sys.exit(rc)

test/resources/testserver/testserver.py

@@ -94,7 +94,7 @@ def start_server(port=7000):
 if __name__ == '__main__':
     import sys
     if len(sys.argv) != 2 or sys.argv[1] not in [ 'start', 'stop' ]:
-        print 'usage: %s start|stop' % sys.argv[0]
+        print('usage: %s start|stop' % sys.argv[0])
         sys.exit(1)
     if sys.argv[1] == 'start':
         start_server()

test/run_tests.py

@@ -53,29 +53,29 @@ def execute_tests(runner, args):
     if not os.path.exists(env.RESULTS_DIR):
         os.mkdir(env.RESULTS_DIR)
     command = [runner] + [arg % ARG_VALUES for arg in ROBOT_ARGS] + args + [env.ACCEPTANCE_TEST_DIR]
-    print ''
-    print 'Starting test execution with command:\n' + ' '.join(command)
+    print('')
+    print('Starting test execution with command:\n' + ' '.join(command))
     syslog = os.path.join(env.RESULTS_DIR, 'syslog.txt')
     call(command, shell=os.sep=='\\', env=dict(os.environ, ROBOT_SYSLOG_FILE=syslog))
 
 def stop_http_server():
     call(['python', env.HTTP_SERVER_FILE, 'stop'])
 
 def process_output(args):
-    print
+    print()
     if _has_robot_27():
         call(['python', os.path.join(env.RESOURCES_DIR, 'statuschecker.py'),
              os.path.join(env.RESULTS_DIR, 'output.xml')])
     rebot = 'rebot' if os.sep == '/' else 'rebot.bat'
     rebot_cmd = [rebot] + [ arg % ARG_VALUES for arg in REBOT_ARGS ] + args + \
                 [os.path.join(ARG_VALUES['outdir'], 'output.xml') ]
-    print ''
-    print 'Starting output processing with command:\n' + ' '.join(rebot_cmd)
+    print('')
+    print('Starting output processing with command:\n' + ' '.join(rebot_cmd))
     rc = call(rebot_cmd, env=os.environ)
     if rc == 0:
-        print 'All critical tests passed'
+        print('All critical tests passed')
     else:
-        print '%d critical test%s failed' % (rc, 's' if rc != 1 else '')
+        print('%d critical test%s failed' % (rc, 's' if rc != 1 else ''))
     return rc
 
 def _has_robot_27():
@@ -89,18 +89,18 @@ def _exit(rc):
     sys.exit(rc)
 
 def _help():
-    print 'Usage:  python run_tests.py python|jython browser [options]'
-    print
-    print 'See README.txt for details.'
+    print('Usage:  python run_tests.py python|jython browser [options]')
+    print()
+    print('See README.txt for details.')
     return 255
 
 def _run_unit_tests():
-    print 'Running unit tests'
+    print('Running unit tests')
     failures = run_unit_tests()
     if failures != 0:
-        print '\n%d unit tests failed - not running acceptance tests!' % failures
+        print('\n%d unit tests failed - not running acceptance tests!' % failures)
     else:
-        print 'All unit tests passed'
+        print('All unit tests passed')
     return failures
 
 

test/run_unit_tests.py

@@ -10,9 +10,9 @@ def run_unit_tests(modules_to_run=[]):
     bad_modules_to_run = [module_to_run for module_to_run in modules_to_run
         if module_to_run not in test_module_names]
     if bad_modules_to_run:
-        print "Specified test module%s not exist: %s" % (
+        print("Specified test module%s not exist: %s" % (
             ' does' if len(bad_modules_to_run) == 1 else 's do',
-            ', '.join(bad_modules_to_run))
+            ', '.join(bad_modules_to_run)))
         return -1
 
     tests = [unittest.defaultTestLoader.loadTestsFromModule(test_module)