Resolving a batch of failing tests for python 2.7.

    Note: please evaluate python 3.X compliance.

8 files changed, 30 insertions, 30 deletions

diff --git a/test/Variables/BoolVariable.py b/test/Variables/BoolVariable.py
index 365567e6..d2599846 100644
--- a/test/Variables/BoolVariable.py
+++ b/test/Variables/BoolVariable.py
@@ -57,8 +57,8 @@ opts.AddVariables(
 env = Environment(variables=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/Variables/EnumVariable.py b/test/Variables/EnumVariable.py
index c04b3968..cf35b9b7 100644
--- a/test/Variables/EnumVariable.py
+++ b/test/Variables/EnumVariable.py
@@ -66,9 +66,9 @@ opts.AddVariables(
 env = Environment(variables=opts)
 Help(opts.GenerateHelpText(env))
 
-print env['debug']
-print env['guilib']
-print env['some']
+print(env['debug'])
+print(env['guilib'])
+print(env['some'])
 
 Default(env.Alias('dummy', None))
 """)
diff --git a/test/Variables/PackageVariable.py b/test/Variables/PackageVariable.py
index 322bc9b9..b3fd10a4 100644
--- a/test/Variables/PackageVariable.py
+++ b/test/Variables/PackageVariable.py
@@ -59,7 +59,7 @@ opts.AddVariables(
 env = Environment(variables=opts)
 Help(opts.GenerateHelpText(env))
 
-print env['x11']
+print(env['x11'])
 Default(env.Alias('dummy', None))
 """)
 
diff --git a/test/Variables/PathVariable.py b/test/Variables/PathVariable.py
index bfe82bad..753aa116 100644
--- a/test/Variables/PathVariable.py
+++ b/test/Variables/PathVariable.py
@@ -64,9 +64,9 @@ opts.AddVariables(
 env = Environment(variables=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') ))
@@ -132,7 +132,7 @@ opts.AddVariables(
 
 env = Environment(variables=opts)
 
-print env['X']
+print(env['X'])
 
 Default(env.Alias('dummy', None))
 """ % default_subdir)
@@ -165,7 +165,7 @@ opts.AddVariables(
 
 env = Environment(variables=opts)
 
-print env['X']
+print(env['X'])
 
 Default(env.Alias('dummy', None))
 """ % default_file)
@@ -211,7 +211,7 @@ opts.AddVariables(
 
 env = Environment(variables=opts)
 
-print env['X']
+print(env['X'])
 
 Default(env.Alias('dummy', None))
 """ % default_subdir)
@@ -259,7 +259,7 @@ opts.AddVariables(
 
 env = Environment(variables=opts)
 
-print env['X']
+print(env['X'])
 
 Default(env.Alias('dummy', None))
 """ % default_subdir)
diff --git a/test/Variables/Variables.py b/test/Variables/Variables.py
index d0bf4320..1c606353 100644
--- a/test/Variables/Variables.py
+++ b/test/Variables/Variables.py
@@ -30,8 +30,8 @@ test = TestSCons.TestSCons()
 
 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(variables=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 variables should not be set:
 assert 'UNSPECIFIED' not in env
@@ -220,8 +220,8 @@ opts.Add('UNSPECIFIED',
 
 env = Environment(variables = opts)
 
-print env['RELEASE_BUILD']
-print env['DEBUG_BUILD']
+print(env['RELEASE_BUILD'])
+print(env['DEBUG_BUILD'])
 
 opts.Save('variables.saved', env)
 """)
@@ -276,9 +276,9 @@ opts.Add('LISTOPTION_TEST',
 
 env = Environment(variables = 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('variables.saved', env)
 """)
diff --git a/test/Variables/chdir.py b/test/Variables/chdir.py
index 621e1660..2d097d5f 100644
--- a/test/Variables/chdir.py
+++ b/test/Variables/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/Variables/help.py b/test/Variables/help.py
index f04f9626..bee60111 100644
--- a/test/Variables/help.py
+++ b/test/Variables/help.py
@@ -81,8 +81,8 @@ opts.AddVariables(
 env = Environment(variables=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/Variables/import.py b/test/Variables/import.py
index 7cdd2741..2da670a7 100644
--- a/test/Variables/import.py
+++ b/test/Variables/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'], """\