summaryrefslogtreecommitdiff
path: root/test/Deprecated
diff options
context:
space:
mode:
authorRussel Winder <russel@winder.org.uk>2016-01-01 15:23:41 +0000
committerRussel Winder <russel@winder.org.uk>2016-01-01 15:23:41 +0000
commiteaf9ba8362c74ce7589b5d2bfc6049d92d0c8d61 (patch)
tree5331118c851cdbc48ce2f983141ccd7c170e88f9 /test/Deprecated
parent533ab8598e0f32928589a5f8061dbe191a095b46 (diff)
downloadscons-eaf9ba8362c74ce7589b5d2bfc6049d92d0c8d61.tar.gz
Some more print statements to functions.
Diffstat (limited to 'test/Deprecated')
-rw-r--r--test/Deprecated/Options/BoolOption.py4
-rw-r--r--test/Deprecated/Options/Options.py26
-rw-r--r--test/Deprecated/Options/PackageOption.py2
-rw-r--r--test/Deprecated/Options/PathOption.py16
-rw-r--r--test/Deprecated/Options/chdir.py2
-rw-r--r--test/Deprecated/Options/help.py6
-rw-r--r--test/Deprecated/Options/import.py2
7 files changed, 29 insertions, 29 deletions
diff --git a/test/Deprecated/Options/BoolOption.py b/test/Deprecated/Options/BoolOption.py
index 563939b4..5d12fc6f 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 61a12f3f..e435b9ef 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 424e5a72..ec8990c3 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 4701420b..0e6949c1 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 a8fb6c6b..977a351b 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 8c240e34..ad8a96b5 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 a4d56b2f..b93e6a26 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'], """\