Merge branch 'feature/upstream' into develop

1 files changed, 138 insertions, 128 deletions

diff --git a/QMTest/TestCmdTests.py b/QMTest/TestCmdTests.py
index 1044ed1..b9226fd 100644
--- a/QMTest/TestCmdTests.py
+++ b/QMTest/TestCmdTests.py
@@ -26,13 +26,14 @@ import os
 import shutil
 import signal
 import stat
-import StringIO
+from StringIO import StringIO
 import sys
 import tempfile
 import time
 import types
 import unittest
-import UserList
+from UserList import UserList
+
 
 # Strip the current directory so we get the right TestCmd.py module.
 sys.path = sys.path[1:]
@@ -131,11 +132,11 @@ class TestCmdTestCase(unittest.TestCase):
         run_env.write(t.scriptout_path, textout)
         run_env.write(t.scripterr_path, texterr)
 
-        os.chmod(t.script_path, 0644)  # XXX UNIX-specific
-        os.chmod(t.scriptx_path, 0755)  # XXX UNIX-specific
-        os.chmod(t.script1_path, 0644)  # XXX UNIX-specific
-        os.chmod(t.scriptout_path, 0644)  # XXX UNIX-specific
-        os.chmod(t.scripterr_path, 0644)  # XXX UNIX-specific
+        os.chmod(t.script_path, 0o644)  # XXX UNIX-specific
+        os.chmod(t.scriptx_path, 0o755)  # XXX UNIX-specific
+        os.chmod(t.script1_path, 0o644)  # XXX UNIX-specific
+        os.chmod(t.scriptout_path, 0o644)  # XXX UNIX-specific
+        os.chmod(t.scripterr_path, 0o644)  # XXX UNIX-specific
 
         t.orig_cwd = os.getcwd()
 
@@ -220,8 +221,8 @@ class cleanup_TestCase(TestCmdTestCase):
         test = TestCmd.TestCmd(workdir = '')
         wdir = test.workdir
         test.write('file2', "Test file #2\n")
-        os.chmod(test.workpath('file2'), 0400)
-        os.chmod(wdir, 0500)
+        os.chmod(test.workpath('file2'), 0o400)
+        os.chmod(wdir, 0o500)
         test.cleanup()
         assert not os.path.exists(wdir)
 
@@ -244,11 +245,12 @@ class cleanup_TestCase(TestCmdTestCase):
 
     def test_atexit(self):
         """Test cleanup() when atexit is used"""
-        self.popen_python("""import sys
+        self.popen_python("""from __future__ import print_function
+import sys
 sys.path = ['%s'] + sys.path
 import atexit
 def my_exitfunc():
-    print "my_exitfunc()"
+    print("my_exitfunc()")
 atexit.register(my_exitfunc)
 import TestCmd
 result = TestCmd.TestCmd(workdir = '')
@@ -257,10 +259,11 @@ sys.exit(0)
 
     def test_exitfunc(self):
         """Test cleanup() when sys.exitfunc is set"""
-        self.popen_python("""import sys
+        self.popen_python("""from __future__ import print_function
+import sys
 sys.path = ['%s'] + sys.path
 def my_exitfunc():
-    print "my_exitfunc()"
+    print("my_exitfunc()")
 sys.exitfunc = my_exitfunc
 import TestCmd
 result = TestCmd.TestCmd(workdir = '')
@@ -286,35 +289,35 @@ class chmod_TestCase(TestCmdTestCase):
             test.chmod(['sub', 'file2'], stat.S_IWRITE)
 
             file1_mode = stat.S_IMODE(os.stat(wdir_file1)[stat.ST_MODE])
-            assert file1_mode == 0444, '0%o' % file1_mode
+            assert file1_mode == 0o444, '0%o' % file1_mode
             file2_mode = stat.S_IMODE(os.stat(wdir_sub_file2)[stat.ST_MODE])
-            assert file2_mode == 0666, '0%o' % file2_mode
+            assert file2_mode == 0o666, '0%o' % file2_mode
 
             test.chmod('file1', stat.S_IWRITE)
             test.chmod(wdir_sub_file2, stat.S_IREAD)
 
             file1_mode = stat.S_IMODE(os.stat(wdir_file1)[stat.ST_MODE])
-            assert file1_mode == 0666, '0%o' % file1_mode
+            assert file1_mode == 0o666, '0%o' % file1_mode
             file2_mode = stat.S_IMODE(os.stat(wdir_sub_file2)[stat.ST_MODE])
-            assert file2_mode == 0444, '0%o' % file2_mode
+            assert file2_mode == 0o444, '0%o' % file2_mode
 
         else:
 
-            test.chmod(wdir_file1, 0700)
-            test.chmod(['sub', 'file2'], 0760)
+            test.chmod(wdir_file1, 0o700)
+            test.chmod(['sub', 'file2'], 0o760)
 
             file1_mode = stat.S_IMODE(os.stat(wdir_file1)[stat.ST_MODE])
-            assert file1_mode == 0700, '0%o' % file1_mode
+            assert file1_mode == 0o700, '0%o' % file1_mode
             file2_mode = stat.S_IMODE(os.stat(wdir_sub_file2)[stat.ST_MODE])
-            assert file2_mode == 0760, '0%o' % file2_mode
+            assert file2_mode == 0o760, '0%o' % file2_mode
 
-            test.chmod('file1', 0765)
-            test.chmod(wdir_sub_file2, 0567)
+            test.chmod('file1', 0o765)
+            test.chmod(wdir_sub_file2, 0o567)
 
             file1_mode = stat.S_IMODE(os.stat(wdir_file1)[stat.ST_MODE])
-            assert file1_mode == 0765, '0%o' % file1_mode
+            assert file1_mode == 0o765, '0%o' % file1_mode
             file2_mode = stat.S_IMODE(os.stat(wdir_sub_file2)[stat.ST_MODE])
-            assert file2_mode == 0567, '0%o' % file2_mode
+            assert file2_mode == 0o567, '0%o' % file2_mode
 
 
 
@@ -593,13 +596,14 @@ sys.exit(0)
 
     def test_diff_stderr_not_affecting_diff_stdout(self):
         """Test diff_stderr() not affecting diff_stdout() behavior"""
-        self.popen_python(r"""import sys
+        self.popen_python(r"""from __future__ import print_function
+import sys
 sys.path = ['%s'] + sys.path
 import TestCmd
 test = TestCmd.TestCmd(diff_stderr='diff_re')
-print "diff_stderr:"
+print("diff_stderr:")
 test.diff_stderr('a\nb.\nc\n', 'a\nbb\nc\n')
-print "diff_stdout:"
+print("diff_stdout:")
 test.diff_stdout('a\nb.\nc\n', 'a\nbb\nc\n')
 sys.exit(0)
 """ % self.orig_cwd,
@@ -699,13 +703,14 @@ sys.exit(0)
 
     def test_diff_stdout_not_affecting_diff_stderr(self):
         """Test diff_stdout() not affecting diff_stderr() behavior"""
-        self.popen_python(r"""import sys
+        self.popen_python(r"""from __future__ import print_function
+import sys
 sys.path = ['%s'] + sys.path
 import TestCmd
 test = TestCmd.TestCmd(diff_stdout='diff_re')
-print "diff_stdout:"
+print("diff_stdout:")
 test.diff_stdout('a\nb.\nc\n', 'a\nbb\nc\n')
-print "diff_stderr:"
+print("diff_stderr:")
 test.diff_stderr('a\nb.\nc\n', 'a\nbb\nc\n')
 sys.exit(0)
 """ % self.orig_cwd,
@@ -1032,14 +1037,14 @@ class match_exact_TestCase(TestCmdTestCase):
         assert test.match_exact("abcde\n", "abcde\n")
         assert not test.match_exact(["12345\n", "abcde\n"], ["1[0-9]*5\n", "a.*e\n"])
         assert test.match_exact(["12345\n", "abcde\n"], ["12345\n", "abcde\n"])
-        assert not test.match_exact(UserList.UserList(["12345\n", "abcde\n"]),
+        assert not test.match_exact(UserList(["12345\n", "abcde\n"]),
                                     ["1[0-9]*5\n", "a.*e\n"])
-        assert test.match_exact(UserList.UserList(["12345\n", "abcde\n"]),
+        assert test.match_exact(UserList(["12345\n", "abcde\n"]),
                                 ["12345\n", "abcde\n"])
         assert not test.match_exact(["12345\n", "abcde\n"],
-                                    UserList.UserList(["1[0-9]*5\n", "a.*e\n"]))
+                                    UserList(["1[0-9]*5\n", "a.*e\n"]))
         assert test.match_exact(["12345\n", "abcde\n"],
-                                UserList.UserList(["12345\n", "abcde\n"]))
+                                UserList(["12345\n", "abcde\n"]))
         assert not test.match_exact("12345\nabcde\n", "1[0-9]*5\na.*e\n")
         assert test.match_exact("12345\nabcde\n", "12345\nabcde\n")
         lines = ["vwxyz\n", "67890\n"]
@@ -1098,28 +1103,28 @@ sys.exit(0)
                                     ["1.*j\n"])
         assert test.match_re_dotall(["12345\n", "abcde\n", "fghij\n"],
                                     ["12345\n", "abcde\n", "fghij\n"])
-        assert test.match_re_dotall(UserList.UserList(["12345\n",
-                                                       "abcde\n",
-                                                       "fghij\n"]),
+        assert test.match_re_dotall(UserList(["12345\n",
+                                              "abcde\n",
+                                              "fghij\n"]),
                                     ["1[0-9]*5\n", "a.*e\n", "f.*j\n"])
-        assert test.match_re_dotall(UserList.UserList(["12345\n",
-                                                       "abcde\n",
-                                                       "fghij\n"]),
+        assert test.match_re_dotall(UserList(["12345\n",
+                                              "abcde\n",
+                                              "fghij\n"]),
                                     ["1.*j\n"])
-        assert test.match_re_dotall(UserList.UserList(["12345\n",
-                                                       "abcde\n",
-                                                       "fghij\n"]),
+        assert test.match_re_dotall(UserList(["12345\n",
+                                              "abcde\n",
+                                              "fghij\n"]),
                                     ["12345\n", "abcde\n", "fghij\n"])
         assert test.match_re_dotall(["12345\n", "abcde\n", "fghij\n"],
-                                    UserList.UserList(["1[0-9]*5\n",
-                                                       "a.*e\n",
-                                                       "f.*j\n"]))
+                                    UserList(["1[0-9]*5\n",
+                                              "a.*e\n",
+                                              "f.*j\n"]))
         assert test.match_re_dotall(["12345\n", "abcde\n", "fghij\n"],
-                                    UserList.UserList(["1.*j\n"]))
+                                    UserList(["1.*j\n"]))
         assert test.match_re_dotall(["12345\n", "abcde\n", "fghij\n"],
-                                    UserList.UserList(["12345\n",
-                                                       "abcde\n",
-                                                       "fghij\n"]))
+                                    UserList(["12345\n",
+                                              "abcde\n",
+                                              "fghij\n"]))
         assert test.match_re_dotall("12345\nabcde\nfghij\n",
                                     "1[0-9]*5\na.*e\nf.*j\n")
         assert test.match_re_dotall("12345\nabcde\nfghij\n", "1.*j\n")
@@ -1176,14 +1181,14 @@ sys.exit(0)
         assert test.match_re("abcde\n", "abcde\n")
         assert test.match_re(["12345\n", "abcde\n"], ["1[0-9]*5\n", "a.*e\n"])
         assert test.match_re(["12345\n", "abcde\n"], ["12345\n", "abcde\n"])
-        assert test.match_re(UserList.UserList(["12345\n", "abcde\n"]),
+        assert test.match_re(UserList(["12345\n", "abcde\n"]),
                              ["1[0-9]*5\n", "a.*e\n"])
-        assert test.match_re(UserList.UserList(["12345\n", "abcde\n"]),
+        assert test.match_re(UserList(["12345\n", "abcde\n"]),
                              ["12345\n", "abcde\n"])
         assert test.match_re(["12345\n", "abcde\n"],
-                             UserList.UserList(["1[0-9]*5\n", "a.*e\n"]))
+                             UserList(["1[0-9]*5\n", "a.*e\n"]))
         assert test.match_re(["12345\n", "abcde\n"],
-                             UserList.UserList(["12345\n", "abcde\n"]))
+                             UserList(["12345\n", "abcde\n"]))
         assert test.match_re("12345\nabcde\n", "1[0-9]*5\na.*e\n")
         assert test.match_re("12345\nabcde\n", "12345\nabcde\n")
         lines = ["vwxyz\n", "67890\n"]
@@ -1463,7 +1468,7 @@ class preserve_TestCase(TestCmdTestCase):
     def test_preserve(self):
         """Test preserve()"""
         def cleanup_test(test, cond=None, stdout=""):
-            io = StringIO.StringIO()
+            io = StringIO()
             save = sys.stdout
             sys.stdout = io
             try:
@@ -1603,7 +1608,7 @@ class read_TestCase(TestCmdTestCase):
         _file_matches(wdir_foo_file3, test.read(['foo', 'file3']),
                         "Test\nfile\n#3.\n")
         _file_matches(wdir_foo_file3,
-                      test.read(UserList.UserList(['foo', 'file3'])),
+                      test.read(UserList(['foo', 'file3'])),
                         "Test\nfile\n#3.\n")
         _file_matches(wdir_file4, test.read('file4', mode = 'r'),
                         "Test\nfile\n#4.\n")
@@ -1861,24 +1866,24 @@ class run_verbose_TestCase(TestCmdTestCase):
                                    interpreter = 'python',
                                    workdir = '',
                                    verbose = 1)
-    
-            sys.stdout = StringIO.StringIO()
-            sys.stderr = StringIO.StringIO()
-    
+
+            sys.stdout = StringIO()
+            sys.stderr = StringIO()
+
             test.run(arguments = ['arg1 arg2'])
             o = sys.stdout.getvalue()
             assert o == '', o
             e = sys.stderr.getvalue()
             expect = 'python "%s" "arg1 arg2"\n' % t.script_path
             assert expect == e, (expect, e)
-    
+
             testx = TestCmd.TestCmd(program = t.scriptx,
                                     workdir = '',
                                     verbose = 1)
-    
-            sys.stdout = StringIO.StringIO()
-            sys.stderr = StringIO.StringIO()
-    
+
+            sys.stdout = StringIO()
+            sys.stderr = StringIO()
+
             testx.run(arguments = ['arg1 arg2'])
             expect = '"%s" "arg1 arg2"\n' % t.scriptx_path
             o = sys.stdout.getvalue()
@@ -1912,10 +1917,10 @@ class run_verbose_TestCase(TestCmdTestCase):
                                    interpreter = 'python',
                                    workdir = '',
                                    verbose = 2)
-    
-            sys.stdout = StringIO.StringIO()
-            sys.stderr = StringIO.StringIO()
-    
+
+            sys.stdout = StringIO()
+            sys.stderr = StringIO()
+
             test.run(arguments = ['arg1 arg2'])
 
             line_fmt = "script:  %s:  %s:  ['arg1 arg2']\n"
@@ -1929,14 +1934,14 @@ class run_verbose_TestCase(TestCmdTestCase):
             expect = 'python "%s" "arg1 arg2"\n' % t.script_path
             e = sys.stderr.getvalue()
             assert e == expect, (e, expect)
-    
+
             testx = TestCmd.TestCmd(program = t.scriptx,
                                     workdir = '',
                                     verbose = 2)
-    
-            sys.stdout = StringIO.StringIO()
-            sys.stderr = StringIO.StringIO()
-    
+
+            sys.stdout = StringIO()
+            sys.stderr = StringIO()
+
             testx.run(arguments = ['arg1 arg2'])
 
             line_fmt = "scriptx.bat:  %s:  %s:  ['arg1 arg2']\n"
@@ -1957,10 +1962,10 @@ class run_verbose_TestCase(TestCmdTestCase):
                                    interpreter = 'python',
                                    workdir = '',
                                    verbose = 2)
-    
-            sys.stdout = StringIO.StringIO()
-            sys.stderr = StringIO.StringIO()
-    
+
+            sys.stdout = StringIO()
+            sys.stderr = StringIO()
+
             test.run(arguments = ['arg1 arg2'])
 
             line_fmt = "scriptout:  %s:  %s:  ['arg1 arg2']\n"
@@ -1977,10 +1982,10 @@ class run_verbose_TestCase(TestCmdTestCase):
                                    interpreter = 'python',
                                    workdir = '',
                                    verbose = 3)
-    
-            sys.stdout = StringIO.StringIO()
-            sys.stderr = StringIO.StringIO()
-    
+
+            sys.stdout = StringIO()
+            sys.stderr = StringIO()
+
             test.run(arguments = ['arg1 arg2'])
 
             line_fmt = "scriptout:  %s:  %s:  ['arg1 arg2']\n"
@@ -2001,10 +2006,10 @@ class run_verbose_TestCase(TestCmdTestCase):
             test = TestCmd.TestCmd(program = t.script,
                                    interpreter = 'python',
                                    workdir = '')
-    
-            sys.stdout = StringIO.StringIO()
-            sys.stderr = StringIO.StringIO()
-    
+
+            sys.stdout = StringIO()
+            sys.stderr = StringIO()
+
             test.run(arguments = ['arg1 arg2'])
 
             line_fmt = "script:  %s:  %s:  ['arg1 arg2']\n"
@@ -2018,13 +2023,13 @@ class run_verbose_TestCase(TestCmdTestCase):
             expect = 'python "%s" "arg1 arg2"\n' % t.script_path
             e = sys.stderr.getvalue()
             assert e == expect, (e, expect)
-    
+
             testx = TestCmd.TestCmd(program = t.scriptx,
                                     workdir = '')
-    
-            sys.stdout = StringIO.StringIO()
-            sys.stderr = StringIO.StringIO()
-    
+
+            sys.stdout = StringIO()
+            sys.stderr = StringIO()
+
             testx.run(arguments = ['arg1 arg2'])
 
             line_fmt = "scriptx.bat:  %s:  %s:  ['arg1 arg2']\n"
@@ -2047,24 +2052,24 @@ class run_verbose_TestCase(TestCmdTestCase):
                                    interpreter = 'python',
                                    workdir = '',
                                    verbose = 1)
-    
-            sys.stdout = StringIO.StringIO()
-            sys.stderr = StringIO.StringIO()
-    
+
+            sys.stdout = StringIO()
+            sys.stderr = StringIO()
+
             test.run(arguments = ['arg1 arg2'])
             o = sys.stdout.getvalue()
             assert o == '', o
             e = sys.stderr.getvalue()
             expect = 'python "%s" "arg1 arg2"\n' % t.script_path
             assert expect == e, (expect, e)
-    
+
             testx = TestCmd.TestCmd(program = t.scriptx,
                                     workdir = '',
                                     verbose = 1)
-    
-            sys.stdout = StringIO.StringIO()
-            sys.stderr = StringIO.StringIO()
-    
+
+            sys.stdout = StringIO()
+            sys.stderr = StringIO()
+
             testx.run(arguments = ['arg1 arg2'])
             expect = '"%s" "arg1 arg2"\n' % t.scriptx_path
             o = sys.stdout.getvalue()
@@ -2095,18 +2100,19 @@ sys.exit(0)
 
     def test_set_diff_function_stdout(self):
         """Test set_diff_function():  stdout"""
-        self.popen_python("""import sys
+        self.popen_python("""from __future__ import print_function
+import sys
 sys.path = ['%s'] + sys.path
 import TestCmd
 test = TestCmd.TestCmd()
-print "diff:"
+print("diff:")
 test.diff("a\\n", "a\\n")
-print "diff_stdout:"
+print("diff_stdout:")
 test.diff_stdout("a\\n", "a\\n")
 test.set_diff_function(stdout='diff_re')
-print "diff:"
+print("diff:")
 test.diff(".\\n", "a\\n")
-print "diff_stdout:"
+print("diff_stdout:")
 test.diff_stdout(".\\n", "a\\n")
 sys.exit(0)
 """ % self.orig_cwd,
@@ -2123,18 +2129,19 @@ diff_stdout:
 
     def test_set_diff_function_stderr(self):
         """Test set_diff_function():  stderr """
-        self.popen_python("""import sys
+        self.popen_python("""from __future__ import print_function
+import sys
 sys.path = ['%s'] + sys.path
 import TestCmd
 test = TestCmd.TestCmd()
-print "diff:"
+print("diff:")
 test.diff("a\\n", "a\\n")
-print "diff_stderr:"
+print("diff_stderr:")
 test.diff_stderr("a\\n", "a\\n")
 test.set_diff_function(stderr='diff_re')
-print "diff:"
+print("diff:")
 test.diff(".\\n", "a\\n")
-print "diff_stderr:"
+print("diff_stderr:")
 test.diff_stderr(".\\n", "a\\n")
 sys.exit(0)
 """ % self.orig_cwd,
@@ -2347,7 +2354,7 @@ while 1:
 logfp.close()
         """ % t.recv_out_path
         t.run_env.write(t.recv_script_path, text)
-        os.chmod(t.recv_script_path, 0644)  # XXX UNIX-specific
+        os.chmod(t.recv_script_path, 0o644)  # XXX UNIX-specific
         return t
 
     def test_start(self):
@@ -2695,9 +2702,10 @@ class stdin_TestCase(TestCmdTestCase):
     def test_stdin(self):
         """Test stdin()"""
         run_env = TestCmd.TestCmd(workdir = '')
-        run_env.write('run', """import fileinput
+        run_env.write('run', """from __future__ import print_function
+import fileinput
 for line in fileinput.input():
-    print 'Y'.join(line[:-1].split('X'))
+    print('Y'.join(line[:-1].split('X')))
 """)
         run_env.write('input', "X on X this X line X\n")
         os.chdir(run_env.workdir)
@@ -2765,11 +2773,11 @@ class subdir_TestCase(TestCmdTestCase):
         assert test.subdir('bar') == 1
         assert test.subdir(['foo', 'succeed']) == 1
         if os.name != "nt":
-            os.chmod(test.workpath('foo'), 0500)
+            os.chmod(test.workpath('foo'), 0o500)
             assert test.subdir(['foo', 'fail']) == 0
         assert test.subdir(['sub', 'dir', 'ectory'], 'sub') == 1
         assert test.subdir('one',
-                           UserList.UserList(['one', 'two']),
+                           UserList(['one', 'two']),
                            ['one', 'two', 'three']) == 3
         assert os.path.isdir(test.workpath('foo'))
         assert os.path.isdir(test.workpath('bar'))
@@ -2962,7 +2970,7 @@ class unlink_TestCase(TestCmdTestCase):
         test.unlink(['foo', 'file3a'])
         assert not os.path.exists(wdir_foo_file3a)
 
-        test.unlink(UserList.UserList(['foo', 'file3b']))
+        test.unlink(UserList(['foo', 'file3b']))
         assert not os.path.exists(wdir_foo_file3b)
 
         test.unlink([test.workdir, 'foo', 'file4'])
@@ -2971,8 +2979,8 @@ class unlink_TestCase(TestCmdTestCase):
         # Make it so we can't unlink file5.
         # For UNIX, remove write permission from the dir and the file.
         # For Windows, open the file.
-        os.chmod(test.workdir, 0500)
-        os.chmod(wdir_file5, 0400)
+        os.chmod(test.workdir, 0o500)
+        os.chmod(wdir_file5, 0o400)
         f = open(wdir_file5, 'r')
 
         try:
@@ -2983,8 +2991,8 @@ class unlink_TestCase(TestCmdTestCase):
             except:
                 raise
         finally:
-            os.chmod(test.workdir, 0700)
-            os.chmod(wdir_file5, 0600)
+            os.chmod(test.workdir, 0o700)
+            os.chmod(wdir_file5, 0o600)
             f.close()
 
 
@@ -3208,11 +3216,11 @@ class executable_TestCase(TestCmdTestCase):
 
         def make_executable(fname):
             st = os.stat(fname)
-            os.chmod(fname, stat.S_IMODE(st[stat.ST_MODE]|0100))
+            os.chmod(fname, stat.S_IMODE(st[stat.ST_MODE]|0o100))
 
         def make_non_executable(fname):
             st = os.stat(fname)
-            os.chmod(fname, stat.S_IMODE(st[stat.ST_MODE]&~0100))
+            os.chmod(fname, stat.S_IMODE(st[stat.ST_MODE]&~0o100))
 
         test.executable(test.workdir, 0)
         # XXX skip these tests if euid == 0?
@@ -3282,7 +3290,7 @@ class write_TestCase(TestCmdTestCase):
         test.write('file9', "Test file #9.\r\n", mode = 'wb')
 
         if os.name != "nt":
-            os.chmod(test.workdir, 0500)
+            os.chmod(test.workdir, 0o500)
             try:
                 test.write('file10', "Test file #10 (should not get created).\n")
             except IOError:  # expect "Permission denied"
@@ -3326,14 +3334,16 @@ class variables_TestCase(TestCmdTestCase):
             'TestCmd',
         ]
 
-        script = "import TestCmd\n" + \
-                 '\n'.join([ "print TestCmd.%s\n" % v for v in variables ])
+        script = "from __future__ import print_function\n" + \
+                 "import TestCmd\n" + \
+                 '\n'.join([ "print(TestCmd.%s\n)" % v for v in variables ])
         run_env.run(program=sys.executable, stdin=script)
         stderr = run_env.stderr()
         assert stderr == "", stderr
 
-        script = "from TestCmd import *\n" + \
-                 '\n'.join([ "print %s" % v for v in variables ])
+        script = "from __future__ import print_function\n" + \
+                 "from TestCmd import *\n" + \
+                 '\n'.join([ "print(%s)" % v for v in variables ])
         run_env.run(program=sys.executable, stdin=script)
         stderr = run_env.stderr()
         assert stderr == "", stderr