Some more print statements to functions.

22 files changed, 85 insertions, 85 deletions

diff --git a/test/Actions/actions.py b/test/Actions/actions.py
index 03d67a0..785a0cb 100644
--- a/test/Actions/actions.py
+++ b/test/Actions/actions.py
@@ -70,7 +70,7 @@ import os
 def func(env, target, source):
     cmd = r'%(_python_)s build.py %%s 3 %%s' %% (' '.join(map(str, target)),
                                        ' '.join(map(str, source)))
-    print cmd
+    print(cmd)
     return os.system(cmd)
 B = Builder(action = func)
 env = Environment(BUILDERS = { 'B' : B })
@@ -91,7 +91,7 @@ class bld(object):
         self.cmd = r'%(_python_)s build.py %%s 4 %%s'
     def __call__(self, env, target, source):
         cmd = self.get_contents(env, target, source)
-        print cmd
+        print(cmd)
         return os.system(cmd)
     def get_contents(self, env, target, source):
         return self.cmd %% (' '.join(map(str, target)),
@@ -114,9 +114,9 @@ def func(env, target, source):
 env = Environment(S = Action('foo'),
                   F = Action(func),
                   L = Action(['arg1', 'arg2']))
-print env.subst('$S')
-print env.subst('$F')
-print env.subst('$L')
+print(env.subst('$S'))
+print(env.subst('$F'))
+print(env.subst('$L'))
 """)
 
 test.run(arguments = '-Q .', stdout = """\
diff --git a/test/AddOption/optional-arg.py b/test/AddOption/optional-arg.py
index f976ad9..b88b796 100644
--- a/test/AddOption/optional-arg.py
+++ b/test/AddOption/optional-arg.py
@@ -43,7 +43,7 @@ AddOption('--install',
           type='string',
           metavar='DIR',
           help='installation directory')
-print GetOption('install')
+print(GetOption('install'))
 """)
 
 test.run('-Q -q',
diff --git a/test/CPPDEFINES/append.py b/test/CPPDEFINES/append.py
index 6e69d09..432ab64 100644
--- a/test/CPPDEFINES/append.py
+++ b/test/CPPDEFINES/append.py
@@ -40,17 +40,17 @@ test.write('SConstruct', """\
 env_1738_2 = Environment(CPPDEFPREFIX='-D')
 env_1738_2['CPPDEFINES'] = ['FOO']
 env_1738_2.Append(CPPDEFINES={'value' : '1'})
-print env_1738_2.subst('$_CPPDEFFLAGS')
+print(env_1738_2.subst('$_CPPDEFFLAGS'))
 #env_1738_2.Object('test_1738_2', 'main.c')
 
 # http://scons.tigris.org/issues/show_bug.cgi?id=2300
 env_2300_1 = Environment(CPPDEFINES = 'foo', CPPDEFPREFIX='-D')
 env_2300_1.Append(CPPDEFINES='bar')
-print env_2300_1.subst('$_CPPDEFFLAGS')
+print(env_2300_1.subst('$_CPPDEFFLAGS'))
 
 env_2300_2 = Environment(CPPDEFINES = ['foo'], CPPDEFPREFIX='-D') # note the list
 env_2300_2.Append(CPPDEFINES='bar')
-print env_2300_2.subst('$_CPPDEFFLAGS')
+print(env_2300_2.subst('$_CPPDEFFLAGS'))
 
 # http://scons.tigris.org/issues/show_bug.cgi?id=1152
 # http://scons.tigris.org/issues/show_bug.cgi?id=2900
@@ -62,18 +62,18 @@ cases=[('string', 'FOO'),
 
 for (t1, c1) in cases:
     for (t2, c2) in cases:
-        print "==== Testing CPPDEFINES, appending a %s to a %s"%(t2, t1)
-        print "   orig = %s, append = %s"%(c1, c2)
+        print("==== Testing CPPDEFINES, appending a %s to a %s"%(t2, t1))
+        print("   orig = %s, append = %s"%(c1, c2))
         env=Environment(CPPDEFINES = c1, CPPDEFPREFIX='-D')
         env.Append(CPPDEFINES = c2)
         final=env.subst('$_CPPDEFFLAGS',source="src", target="tgt")
-        print 'Append: \\n\\tresult=%s\\n\\tfinal=%s'%\\
-              (env['CPPDEFINES'], final)
+        print('Append: \\n\\tresult=%s\\n\\tfinal=%s'%\\
+              (env['CPPDEFINES'], final))
         env=Environment(CPPDEFINES = c1, CPPDEFPREFIX='-D')
         env.AppendUnique(CPPDEFINES = c2)
         final=env.subst('$_CPPDEFFLAGS',source="src", target="tgt")
-        print 'AppendUnique:\\n\\tresult=%s\\n\\tfinal=%s'%\\
-              (env['CPPDEFINES'], final)
+        print('AppendUnique:\\n\\tresult=%s\\n\\tfinal=%s'%\\
+              (env['CPPDEFINES'], final))
 """)
 
 
@@ -83,7 +83,7 @@ expect_print_output="""\
 -Dfoo -Dbar
 ==== Testing CPPDEFINES, appending a string to a string
    orig = FOO, append = FOO
-Append: 
+Append:
 	result=['FOO', 'FOO']
 	final=-DFOO -DFOO
 AppendUnique:
@@ -91,7 +91,7 @@ AppendUnique:
 	final=-DFOO
 ==== Testing CPPDEFINES, appending a list to a string
    orig = FOO, append = ['NAME1', 'NAME2']
-Append: 
+Append:
 	result=['FOO', 'NAME1', 'NAME2']
 	final=-DFOO -DNAME1 -DNAME2
 AppendUnique:
@@ -99,7 +99,7 @@ AppendUnique:
 	final=-DFOO -DNAME1 -DNAME2
 ==== Testing CPPDEFINES, appending a list-of-2lists to a string
    orig = FOO, append = [('NAME1', 'VAL1'), ['NAME2', 'VAL2']]
-Append: 
+Append:
 	result=['FOO', ('NAME1', 'VAL1'), ['NAME2', 'VAL2']]
 	final=-DFOO -DNAME1=VAL1 -DNAME2=VAL2
 AppendUnique:
@@ -107,7 +107,7 @@ AppendUnique:
 	final=-DFOO -DNAME1=VAL1 -DNAME2=VAL2
 ==== Testing CPPDEFINES, appending a dict to a string
    orig = FOO, append = {'NAME2': 'VAL2', 'NAME3': None, 'NAME1': 'VAL1'}
-Append: 
+Append:
 	result=['FOO', {'NAME2': 'VAL2', 'NAME3': None, 'NAME1': 'VAL1'}]
 	final=-DFOO -DNAME2=VAL2 -DNAME3 -DNAME1=VAL1
 AppendUnique:
@@ -115,7 +115,7 @@ AppendUnique:
 	final=-DFOO -DNAME2=VAL2 -DNAME3 -DNAME1=VAL1
 ==== Testing CPPDEFINES, appending a string to a list
    orig = ['NAME1', 'NAME2'], append = FOO
-Append: 
+Append:
 	result=['NAME1', 'NAME2', 'FOO']
 	final=-DNAME1 -DNAME2 -DFOO
 AppendUnique:
@@ -123,7 +123,7 @@ AppendUnique:
 	final=-DNAME1 -DNAME2 -DFOO
 ==== Testing CPPDEFINES, appending a list to a list
    orig = ['NAME1', 'NAME2'], append = ['NAME1', 'NAME2']
-Append: 
+Append:
 	result=['NAME1', 'NAME2', 'NAME1', 'NAME2']
 	final=-DNAME1 -DNAME2 -DNAME1 -DNAME2
 AppendUnique:
@@ -131,7 +131,7 @@ AppendUnique:
 	final=-DNAME1 -DNAME2
 ==== Testing CPPDEFINES, appending a list-of-2lists to a list
    orig = ['NAME1', 'NAME2'], append = [('NAME1', 'VAL1'), ['NAME2', 'VAL2']]
-Append: 
+Append:
 	result=['NAME1', 'NAME2', ('NAME1', 'VAL1'), ['NAME2', 'VAL2']]
 	final=-DNAME1 -DNAME2 -DNAME1=VAL1 -DNAME2=VAL2
 AppendUnique:
@@ -139,7 +139,7 @@ AppendUnique:
 	final=-DNAME1 -DNAME2 -DNAME1=VAL1 -DNAME2=VAL2
 ==== Testing CPPDEFINES, appending a dict to a list
    orig = ['NAME1', 'NAME2'], append = {'NAME2': 'VAL2', 'NAME3': None, 'NAME1': 'VAL1'}
-Append: 
+Append:
 	result=['NAME1', 'NAME2', {'NAME2': 'VAL2', 'NAME3': None, 'NAME1': 'VAL1'}]
 	final=-DNAME1 -DNAME2 -DNAME2=VAL2 -DNAME3 -DNAME1=VAL1
 AppendUnique:
@@ -147,7 +147,7 @@ AppendUnique:
 	final=-DNAME1 -DNAME2 -DNAME2=VAL2 -DNAME3 -DNAME1=VAL1
 ==== Testing CPPDEFINES, appending a string to a list-of-2lists
    orig = [('NAME1', 'VAL1'), ['NAME2', 'VAL2']], append = FOO
-Append: 
+Append:
 	result=[('NAME1', 'VAL1'), ['NAME2', 'VAL2'], 'FOO']
 	final=-DNAME1=VAL1 -DNAME2=VAL2 -DFOO
 AppendUnique:
@@ -155,7 +155,7 @@ AppendUnique:
 	final=-DNAME1=VAL1 -DNAME2=VAL2 -DFOO
 ==== Testing CPPDEFINES, appending a list to a list-of-2lists
    orig = [('NAME1', 'VAL1'), ['NAME2', 'VAL2']], append = ['NAME1', 'NAME2']
-Append: 
+Append:
 	result=[('NAME1', 'VAL1'), ['NAME2', 'VAL2'], 'NAME1', 'NAME2']
 	final=-DNAME1=VAL1 -DNAME2=VAL2 -DNAME1 -DNAME2
 AppendUnique:
@@ -163,7 +163,7 @@ AppendUnique:
 	final=-DNAME1=VAL1 -DNAME2=VAL2 -DNAME1 -DNAME2
 ==== Testing CPPDEFINES, appending a list-of-2lists to a list-of-2lists
    orig = [('NAME1', 'VAL1'), ['NAME2', 'VAL2']], append = [('NAME1', 'VAL1'), ['NAME2', 'VAL2']]
-Append: 
+Append:
 	result=[('NAME1', 'VAL1'), ['NAME2', 'VAL2'], ('NAME1', 'VAL1'), ['NAME2', 'VAL2']]
 	final=-DNAME1=VAL1 -DNAME2=VAL2 -DNAME1=VAL1 -DNAME2=VAL2
 AppendUnique:
@@ -171,7 +171,7 @@ AppendUnique:
 	final=-DNAME1=VAL1 -DNAME2=VAL2
 ==== Testing CPPDEFINES, appending a dict to a list-of-2lists
    orig = [('NAME1', 'VAL1'), ['NAME2', 'VAL2']], append = {'NAME2': 'VAL2', 'NAME3': None, 'NAME1': 'VAL1'}
-Append: 
+Append:
 	result=[('NAME1', 'VAL1'), ['NAME2', 'VAL2'], {'NAME2': 'VAL2', 'NAME3': None, 'NAME1': 'VAL1'}]
 	final=-DNAME1=VAL1 -DNAME2=VAL2 -DNAME2=VAL2 -DNAME3 -DNAME1=VAL1
 AppendUnique:
@@ -179,7 +179,7 @@ AppendUnique:
 	final=-DNAME2=VAL2 -DNAME3 -DNAME1=VAL1
 ==== Testing CPPDEFINES, appending a string to a dict
    orig = {'NAME2': 'VAL2', 'NAME3': None, 'NAME1': 'VAL1'}, append = FOO
-Append: 
+Append:
 	result={'FOO': None, 'NAME2': 'VAL2', 'NAME3': None, 'NAME1': 'VAL1'}
 	final=-DFOO -DNAME1=VAL1 -DNAME2=VAL2 -DNAME3
 AppendUnique:
@@ -187,7 +187,7 @@ AppendUnique:
 	final=-DNAME2=VAL2 -DNAME3 -DNAME1=VAL1 -DFOO
 ==== Testing CPPDEFINES, appending a list to a dict
    orig = {'NAME2': 'VAL2', 'NAME3': None, 'NAME1': 'VAL1'}, append = ['NAME1', 'NAME2']
-Append: 
+Append:
 	result=[('NAME2', 'VAL2'), ('NAME3',), ('NAME1', 'VAL1'), 'NAME1', 'NAME2']
 	final=-DNAME2=VAL2 -DNAME3 -DNAME1=VAL1 -DNAME1 -DNAME2
 AppendUnique:
@@ -195,7 +195,7 @@ AppendUnique:
 	final=-DNAME2=VAL2 -DNAME3 -DNAME1=VAL1 -DNAME1 -DNAME2
 ==== Testing CPPDEFINES, appending a list-of-2lists to a dict
    orig = {'NAME2': 'VAL2', 'NAME3': None, 'NAME1': 'VAL1'}, append = [('NAME1', 'VAL1'), ['NAME2', 'VAL2']]
-Append: 
+Append:
 	result=[('NAME2', 'VAL2'), ('NAME3',), ('NAME1', 'VAL1'), ('NAME1', 'VAL1'), ['NAME2', 'VAL2']]
 	final=-DNAME2=VAL2 -DNAME3 -DNAME1=VAL1 -DNAME1=VAL1 -DNAME2=VAL2
 AppendUnique:
@@ -203,7 +203,7 @@ AppendUnique:
 	final=-DNAME2=VAL2 -DNAME3 -DNAME1=VAL1
 ==== Testing CPPDEFINES, appending a dict to a dict
    orig = {'NAME2': 'VAL2', 'NAME3': None, 'NAME1': 'VAL1'}, append = {'NAME2': 'VAL2', 'NAME3': None, 'NAME1': 'VAL1'}
-Append: 
+Append:
 	result={'NAME2': 'VAL2', 'NAME3': None, 'NAME1': 'VAL1'}
 	final=-DNAME1=VAL1 -DNAME2=VAL2 -DNAME3
 AppendUnique:
@@ -213,7 +213,7 @@ AppendUnique:
 
 build_output="scons: `.' is up to date.\n"
 
-expect = test.wrap_stdout(build_str=build_output, 
+expect = test.wrap_stdout(build_str=build_output,
                           read_str = expect_print_output)
 test.run(arguments = '.', stdout=expect)
 test.pass_test()
diff --git a/test/CPPDEFINES/basic.py b/test/CPPDEFINES/basic.py
index b54a421..57d7260 100644
--- a/test/CPPDEFINES/basic.py
+++ b/test/CPPDEFINES/basic.py
@@ -41,13 +41,13 @@ test_list = [
 ]
 for i in test_list:
     env = Environment(CPPDEFPREFIX='-D', CPPDEFSUFFIX='', INTEGER=0)
-    print env.Clone(CPPDEFINES=i).subst('$_CPPDEFFLAGS')
+    print(env.Clone(CPPDEFINES=i).subst('$_CPPDEFFLAGS'))
 for i in test_list:
     env = Environment(CPPDEFPREFIX='|', CPPDEFSUFFIX='|', INTEGER=1)
-    print env.Clone(CPPDEFINES=i).subst('$_CPPDEFFLAGS')
+    print(env.Clone(CPPDEFINES=i).subst('$_CPPDEFFLAGS'))
 """)
 
-expect = test.wrap_stdout(build_str="scons: `.' is up to date.\n", 
+expect = test.wrap_stdout(build_str="scons: `.' is up to date.\n",
                           read_str = """\
 -Dxyz
 -Dx -Dy -Dz
diff --git a/test/CPPDEFINES/undefined.py b/test/CPPDEFINES/undefined.py
index 47825b6..b26b05a 100644
--- a/test/CPPDEFINES/undefined.py
+++ b/test/CPPDEFINES/undefined.py
@@ -34,10 +34,10 @@ test = TestSCons.TestSCons()
 
 test.write('SConstruct', """\
 env = Environment()
-print env.subst('$_CPPDEFFLAGS')
+print(env.subst('$_CPPDEFFLAGS'))
 """)
 
-expect = test.wrap_stdout(build_str="scons: `.' is up to date.\n", 
+expect = test.wrap_stdout(build_str="scons: `.' is up to date.\n",
                           read_str = "\n")
 
 test.run(arguments = '.', stdout=expect)
diff --git a/test/CacheDir/scanner-target.py b/test/CacheDir/scanner-target.py
index 645b597..c39042e 100644
--- a/test/CacheDir/scanner-target.py
+++ b/test/CacheDir/scanner-target.py
@@ -52,7 +52,7 @@ def docopy(target,source,env):
     f.close()
 
 def sillyScanner(node, env, dirs):
-    print 'This is never called (unless we build file.out)'
+    print('This is never called (unless we build file.out)')
     return []
 
 SillyScanner = SCons.Scanner.Base(function = sillyScanner, skeys = ['.res'])
diff --git a/test/CacheDir/source-scanner.py b/test/CacheDir/source-scanner.py
index e7db5e9..2359872 100644
--- a/test/CacheDir/source-scanner.py
+++ b/test/CacheDir/source-scanner.py
@@ -54,7 +54,7 @@ def docopy(target,source,env):
     f.close()
 
 def sillyScanner(node, env, dirs):
-    print 'This is never called (unless we build file.out)'
+    print('This is never called (unless we build file.out)')
     return []
 
 SillyScanner = SCons.Scanner.Base(function = sillyScanner, skeys = ['.res'])
diff --git a/test/Climb/filename--D.py b/test/Climb/filename--D.py
index 06d95e7..6fea9bc 100644
--- a/test/Climb/filename--D.py
+++ b/test/Climb/filename--D.py
@@ -36,12 +36,12 @@ test = TestSCons.TestSCons()
 test.subdir('subdir', 'other')
 
 test.write('main.scons', """\
-print "main.scons"
+print("main.scons")
 SConscript('subdir/sub.scons')
 """)
 
 test.write(['subdir', 'sub.scons'], """\
-print "subdir/sub.scons"
+print("subdir/sub.scons")
 """)
 
 
diff --git a/test/Climb/filename--U.py b/test/Climb/filename--U.py
index 7f2e60d..49ccc0a 100644
--- a/test/Climb/filename--U.py
+++ b/test/Climb/filename--U.py
@@ -36,12 +36,12 @@ test = TestSCons.TestSCons()
 test.subdir('subdir', 'other')
 
 test.write('main.scons', """\
-print "main.scons"
+print("main.scons")
 SConscript('subdir/sub.scons')
 """)
 
 test.write(['subdir', 'sub.scons'], """\
-print "subdir/sub.scons"
+print("subdir/sub.scons")
 """)
 
 read_str = """\
diff --git a/test/Climb/filename-u.py b/test/Climb/filename-u.py
index 7bae153..4485c4b 100644
--- a/test/Climb/filename-u.py
+++ b/test/Climb/filename-u.py
@@ -36,12 +36,12 @@ test = TestSCons.TestSCons()
 test.subdir('subdir', 'other')
 
 test.write('main.scons', """\
-print "main.scons"
+print("main.scons")
 SConscript('subdir/sub.scons')
 """)
 
 test.write(['subdir', 'sub.scons'], """\
-print "subdir/sub.scons"
+print("subdir/sub.scons")
 """)
 
 read_str = """\
diff --git a/test/Clone-compatibility.py b/test/Clone-compatibility.py
index 089b7a4..a2f6362 100644
--- a/test/Clone-compatibility.py
+++ b/test/Clone-compatibility.py
@@ -48,8 +48,8 @@ except AttributeError:
 env1 = Environment(X = 1)
 env2 = env1.Clone(X = 2)
 
-print env1['X']
-print env2['X']
+print(env1['X'])
+print(env2['X'])
 """)
 
 test.run(arguments = '-q -Q', stdout = "1\n2\n")
diff --git a/test/Configure/Streamer1.py b/test/Configure/Streamer1.py
index 8f35308..318a936 100644
--- a/test/Configure/Streamer1.py
+++ b/test/Configure/Streamer1.py
@@ -45,7 +45,7 @@ test.write('SConstruct', """
 def hello(target, source, env):
   import traceback
   try:
-    print 'hello!\\n' # this breaks the script
+    print('hello!\\n') # this breaks the script
     with open(env.subst('$TARGET', target = target),'w') as f:
       f.write('yes')
   except:
diff --git a/test/Configure/cache-not-ok.py b/test/Configure/cache-not-ok.py
index ccbb7d5..7502f7a 100644
--- a/test/Configure/cache-not-ok.py
+++ b/test/Configure/cache-not-ok.py
@@ -53,7 +53,7 @@ r1 = conf.CheckCHeader( 'no_std_c_header.h' ) # leads to compile error
 r2 = conf.CheckLib( 'no_c_library_SAFFDG' )   # leads to link error
 env = conf.Finish()
 if not (not r1 and not r2):
-     print "FAIL: ", r1, r2
+     print("FAIL: ", r1, r2)
      Exit(1)
 """)
 
diff --git a/test/ConstructionEnvironment.py b/test/ConstructionEnvironment.py
index bec46b9..e25f86a 100644
--- a/test/ConstructionEnvironment.py
+++ b/test/ConstructionEnvironment.py
@@ -38,7 +38,7 @@ import SCons.Defaults
 SCons.Defaults.ConstructionEnvironment.update({
         'XXX'   : 777,
 })
-print DefaultEnvironment()['XXX']
+print(DefaultEnvironment()['XXX'])
 """)
 
 expect = test.wrap_stdout(read_str = "777\n",
diff --git a/test/Deprecated/Options/BoolOption.py b/test/Deprecated/Options/BoolOption.py
index 563939b..5d12fc6 100644
--- a/test/Deprecated/Options/BoolOption.py
+++ b/test/Deprecated/Options/BoolOption.py
@@ -55,8 +55,8 @@ opts.AddOptions(
 env = Environment(options=opts)
 Help(opts.GenerateHelpText(env))
 
-print env['warnings']
-print env['profile']
+print(env['warnings'])
+print(env['profile'])
 
 Default(env.Alias('dummy', None))
 """)
diff --git a/test/Deprecated/Options/Options.py b/test/Deprecated/Options/Options.py
index 61a12f3..e435b9e 100644
--- a/test/Deprecated/Options/Options.py
+++ b/test/Deprecated/Options/Options.py
@@ -30,8 +30,8 @@ test = TestSCons.TestSCons(match = TestSCons.match_re_dotall)
 
 test.write('SConstruct', """
 env = Environment()
-print env['CC']
-print " ".join(env['CCFLAGS'])
+print(env['CC'])
+print(" ".join(env['CCFLAGS']))
 Default(env.Alias('dummy', None))
 """)
 test.run()
@@ -99,12 +99,12 @@ env = Environment(options=opts, tools=['default', test_tool])
 
 Help('Variables settable in custom.py or on the command line:\\n' + opts.GenerateHelpText(env))
 
-print env['RELEASE_BUILD']
-print env['DEBUG_BUILD']
-print env['CC']
-print " ".join(env['CCFLAGS'])
-print env['VALIDATE']
-print env['valid_key']
+print(env['RELEASE_BUILD'])
+print(env['DEBUG_BUILD'])
+print(env['CC'])
+print(" ".join(env['CCFLAGS']))
+print(env['VALIDATE'])
+print(env['valid_key'])
 
 # unspecified options should not be set:
 assert 'UNSPECIFIED' not in env
@@ -226,8 +226,8 @@ opts.Add('UNSPECIFIED',
 
 env = Environment(options = opts)
 
-print env['RELEASE_BUILD']
-print env['DEBUG_BUILD']
+print(env['RELEASE_BUILD'])
+print(env['DEBUG_BUILD'])
 
 opts.Save('options.saved', env)
 """)
@@ -282,9 +282,9 @@ opts.Add('LISTOPTION_TEST',
 
 env = Environment(options = opts)
 
-print env['RELEASE_BUILD']
-print env['DEBUG_BUILD']
-print env['LISTOPTION_TEST']
+print(env['RELEASE_BUILD'])
+print(env['DEBUG_BUILD'])
+print(env['LISTOPTION_TEST'])
 
 opts.Save('options.saved', env)
 """)
diff --git a/test/Deprecated/Options/PackageOption.py b/test/Deprecated/Options/PackageOption.py
index 424e5a7..ec8990c 100644
--- a/test/Deprecated/Options/PackageOption.py
+++ b/test/Deprecated/Options/PackageOption.py
@@ -59,7 +59,7 @@ opts.AddOptions(
 env = Environment(options=opts)
 Help(opts.GenerateHelpText(env))
 
-print env['x11']
+print(env['x11'])
 Default(env.Alias('dummy', None))
 """)
 
diff --git a/test/Deprecated/Options/PathOption.py b/test/Deprecated/Options/PathOption.py
index 4701420..0e6949c 100644
--- a/test/Deprecated/Options/PathOption.py
+++ b/test/Deprecated/Options/PathOption.py
@@ -25,7 +25,7 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 """
-Test the PathOption canned option type, with tests for its 
+Test the PathOption canned option type, with tests for its
 various canned validators.
 """
 
@@ -65,9 +65,9 @@ opts.AddOptions(
 env = Environment(options=opts)
 Help(opts.GenerateHelpText(env))
 
-print env['qtdir']
-print env['qt_libraries']
-print env.subst('$qt_libraries')
+print(env['qtdir'])
+print(env['qt_libraries'])
+print(env.subst('$qt_libraries'))
 
 Default(env.Alias('dummy', None))
 """ % (workpath, os.path.join('$qtdir', 'lib') ))
@@ -144,7 +144,7 @@ opts.AddOptions(
 
 env = Environment(options=opts)
 
-print env['X']
+print(env['X'])
 
 Default(env.Alias('dummy', None))
 """ % default_subdir)
@@ -177,7 +177,7 @@ opts.AddOptions(
 
 env = Environment(options=opts)
 
-print env['X']
+print(env['X'])
 
 Default(env.Alias('dummy', None))
 """ % default_file)
@@ -218,7 +218,7 @@ opts.AddOptions(
 
 env = Environment(options=opts)
 
-print env['X']
+print(env['X'])
 
 Default(env.Alias('dummy', None))
 """ % default_subdir)
@@ -263,7 +263,7 @@ opts.AddOptions(
 
 env = Environment(options=opts)
 
-print env['X']
+print(env['X'])
 
 Default(env.Alias('dummy', None))
 """ % default_subdir)
diff --git a/test/Deprecated/Options/chdir.py b/test/Deprecated/Options/chdir.py
index a8fb6c6..977a351 100644
--- a/test/Deprecated/Options/chdir.py
+++ b/test/Deprecated/Options/chdir.py
@@ -46,7 +46,7 @@ SConscript_contents = """\
 Import("opts")
 env = Environment()
 opts.Update(env)
-print "VARIABLE =", repr(env['VARIABLE'])
+print("VARIABLE =", repr(env['VARIABLE']))
 """
 
 test.write(['bin', 'opts.cfg'], """\
diff --git a/test/Deprecated/Options/help.py b/test/Deprecated/Options/help.py
index 8c240e3..ad8a96b 100644
--- a/test/Deprecated/Options/help.py
+++ b/test/Deprecated/Options/help.py
@@ -49,7 +49,7 @@ libdirvar_re = re.escape(libdirvar)
 
 test.subdir(qtpath)
 test.subdir(libpath)
-         
+
 test.write('SConstruct', """
 from SCons.Options import BoolOption, EnumOption, ListOption, \
    PackageOption, PathOption
@@ -86,8 +86,8 @@ opts.AddOptions(
 env = Environment(options=opts)
 Help(opts.GenerateHelpText(env))
 
-print env['warnings']
-print env['profile']
+print(env['warnings'])
+print(env['profile'])
 
 Default(env.Alias('dummy', None))
 """ % locals())
diff --git a/test/Deprecated/Options/import.py b/test/Deprecated/Options/import.py
index a4d56b2..b93e6a2 100644
--- a/test/Deprecated/Options/import.py
+++ b/test/Deprecated/Options/import.py
@@ -48,7 +48,7 @@ SConscript_contents = """\
 Import("opts")
 env = Environment()
 opts.Update(env)
-print "VARIABLE =", env.get('VARIABLE')
+print("VARIABLE =", env.get('VARIABLE'))
 """
 
 test.write(['bin', 'opts.cfg'], """\
diff --git a/test/Dir/Dir.py b/test/Dir/Dir.py
index af0a10b..2e8204c 100644
--- a/test/Dir/Dir.py
+++ b/test/Dir/Dir.py
@@ -36,12 +36,12 @@ test = TestSCons.TestSCons()
 
 test.write('SConstruct', """
 env = Environment(FOO = 'fff', BAR = 'bbb')
-print Dir('ddd')
-print Dir('$FOO')
-print Dir('${BAR}_$BAR')
-print env.Dir('eee')
-print env.Dir('$FOO')
-print env.Dir('${BAR}_$BAR')
+print(Dir('ddd'))
+print(Dir('$FOO'))
+print(Dir('${BAR}_$BAR'))
+print(env.Dir('eee'))
+print(env.Dir('$FOO'))
+print(env.Dir('${BAR}_$BAR'))
 """)
 
 test.run(stdout = test.wrap_stdout(read_str = """\