diff options
author | William Blevins <wblevins001@gmail.com> | 2016-01-24 16:36:12 (GMT) |
---|---|---|
committer | William Blevins <wblevins001@gmail.com> | 2016-01-24 16:36:12 (GMT) |
commit | 36d36e8dbf9e43c412f7a52a38dc1f9d9e8bb078 (patch) | |
tree | 9d10b6f009624a613c6a78b71736d0416849f329 | |
parent | 358c0de48a7d9fecdb30e24505c066506dfcdeff (diff) | |
download | SCons-36d36e8dbf9e43c412f7a52a38dc1f9d9e8bb078.zip SCons-36d36e8dbf9e43c412f7a52a38dc1f9d9e8bb078.tar.gz SCons-36d36e8dbf9e43c412f7a52a38dc1f9d9e8bb078.tar.bz2 |
Resolving a batch of failing tests for python 2.7.
Note: please evaluate python 3.X compliance.
-rw-r--r-- | src/engine/SCons/Script/Main.py | 6 | ||||
-rw-r--r-- | test/Split.py | 16 | ||||
-rw-r--r-- | test/TARGETS.py | 28 | ||||
-rw-r--r-- | test/Variables/BoolVariable.py | 4 | ||||
-rw-r--r-- | test/Variables/EnumVariable.py | 6 | ||||
-rw-r--r-- | test/Variables/PackageVariable.py | 2 | ||||
-rw-r--r-- | test/Variables/PathVariable.py | 14 | ||||
-rw-r--r-- | test/Variables/Variables.py | 26 | ||||
-rw-r--r-- | test/Variables/chdir.py | 2 | ||||
-rw-r--r-- | test/Variables/help.py | 4 | ||||
-rw-r--r-- | test/Variables/import.py | 2 | ||||
-rw-r--r-- | test/WhereIs.py | 24 | ||||
-rw-r--r-- | test/_CPPINCFLAGS.py | 6 | ||||
-rw-r--r-- | test/custom-concat.py | 2 | ||||
-rw-r--r-- | test/exitfns.py | 6 | ||||
-rw-r--r-- | test/import.py | 7 | ||||
-rw-r--r-- | test/no-arguments.py | 2 | ||||
-rw-r--r-- | test/option--C.py | 6 | ||||
-rw-r--r-- | test/option--I.py | 4 | ||||
-rw-r--r-- | test/option-f.py | 8 | ||||
-rw-r--r-- | test/overrides.py | 6 | ||||
-rw-r--r-- | test/preserve-source.py | 2 | ||||
-rw-r--r-- | test/site_scons/basic.py | 4 | ||||
-rw-r--r-- | test/site_scons/no-site-dir.py | 4 | ||||
-rw-r--r-- | test/site_scons/override.py | 2 | ||||
-rw-r--r-- | test/site_scons/site-dir.py | 4 | ||||
-rw-r--r-- | test/site_scons/site_init.py | 8 |
27 files changed, 101 insertions, 104 deletions
diff --git a/src/engine/SCons/Script/Main.py b/src/engine/SCons/Script/Main.py index 7cc7d47..997d701 100644 --- a/src/engine/SCons/Script/Main.py +++ b/src/engine/SCons/Script/Main.py @@ -10,8 +10,6 @@ some other module. If it's specific to the "scons" script invocation, it goes here. """ -from __future__ import print_function - unsupported_python_version = (2, 6, 0) deprecated_python_version = (2, 7, 0) @@ -330,7 +328,7 @@ class CleanTask(SCons.Taskmaster.AlwaysTask): except SCons.Errors.UserError as e: print(e) except (IOError, OSError) as e: - print_("scons: Could not remove '%s':" % pathstr, e.strerror) + print("scons: Could not remove '%s':" % pathstr, e.strerror) def _get_files_to_clean(self): result = [] @@ -794,7 +792,7 @@ def _load_all_site_scons_dirs(topdir, verbose=None): dirs=sysdirs + [topdir] for d in dirs: if verbose: # this is used by unit tests. - print_("Loading site dir ", d) + print("Loading site dir ", d) _load_site_scons_dir(d) def test_load_all_site_scons_dirs(d): diff --git a/test/Split.py b/test/Split.py index e98e299..c0533fa 100644 --- a/test/Split.py +++ b/test/Split.py @@ -30,19 +30,19 @@ test = TestSCons.TestSCons() test.write('SConstruct', """ env = Environment(BBB = 'bbb', CCC = 'ccc') -print Split('aaa') -print Split('aaa $BBB') -print env.Split('bbb $CCC') -print env.Split('$BBB ccc') -print Split(['ddd', 'eee']) +print(Split('aaa')) +print(Split('aaa $BBB')) +print(env.Split('bbb $CCC')) +print(env.Split('$BBB ccc')) +print(Split(['ddd', 'eee'])) SConscript('SConscript') """) test.write('SConscript', """ env = Environment(FFF='fff', JJJ='jjj') -print env.Split('${FFF}.f') -print Split('ggg hhh') -print env.Split(['iii', '$JJJ']) +print(env.Split('${FFF}.f')) +print(Split('ggg hhh')) +print(env.Split(['iii', '$JJJ'])) """) expect = """\ diff --git a/test/TARGETS.py b/test/TARGETS.py index 5b36c49..0ffc3b6 100644 --- a/test/TARGETS.py +++ b/test/TARGETS.py @@ -35,11 +35,11 @@ test = TestSCons.TestSCons() test.write('SConstruct', """ -print COMMAND_LINE_TARGETS -print list(map(str, BUILD_TARGETS)) +print(COMMAND_LINE_TARGETS) +print(list(map(str, BUILD_TARGETS))) Default('.') -print COMMAND_LINE_TARGETS -print list(map(str, BUILD_TARGETS)) +print(COMMAND_LINE_TARGETS) +print(list(map(str, BUILD_TARGETS))) """) test.write('aaa', 'aaa\n') @@ -68,17 +68,17 @@ test.run(arguments = 'bbb ccc=xyz -n aaa', stdout = expect) test.write('SConstruct', """ env = Environment() -print list(map(str, DEFAULT_TARGETS)) -print list(map(str, BUILD_TARGETS)) +print(list(map(str, DEFAULT_TARGETS))) +print(list(map(str, BUILD_TARGETS))) Default('aaa') -print list(map(str, DEFAULT_TARGETS)) -print list(map(str, BUILD_TARGETS)) +print(list(map(str, DEFAULT_TARGETS))) +print(list(map(str, BUILD_TARGETS))) env.Default('bbb') -print list(map(str, DEFAULT_TARGETS)) -print list(map(str, BUILD_TARGETS)) +print(list(map(str, DEFAULT_TARGETS))) +print(list(map(str, BUILD_TARGETS))) env.Default(None) -print list(map(str, DEFAULT_TARGETS)) -print list(map(str, BUILD_TARGETS)) +print(list(map(str, DEFAULT_TARGETS))) +print(list(map(str, BUILD_TARGETS))) env.Default('ccc') """) @@ -113,9 +113,9 @@ test.run(arguments = '.', stdout = expect) test.write('SConstruct', """\ -print list(map(str, BUILD_TARGETS)) +print(list(map(str, BUILD_TARGETS))) SConscript('SConscript') -print list(map(str, BUILD_TARGETS)) +print(list(map(str, BUILD_TARGETS))) """) test.write('SConscript', """\ diff --git a/test/Variables/BoolVariable.py b/test/Variables/BoolVariable.py index 365567e..d259984 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 c04b396..cf35b9b 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 322bc9b..b3fd10a 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 bfe82ba..753aa11 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 d0bf432..1c60635 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 621e166..2d097d5 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 f04f962..bee6011 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 7cdd274..2da670a 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'], """\ diff --git a/test/WhereIs.py b/test/WhereIs.py index 07c3f6c..c765848 100644 --- a/test/WhereIs.py +++ b/test/WhereIs.py @@ -67,14 +67,14 @@ pathdirs_1243 = [ test.workpath('sub1'), test.write('SConstruct', """ SConscript('%s') env = Environment() -print WhereIs('xxx.exe') -print WhereIs('xxx.exe', %s) -print env.WhereIs('xxx.exe', %s) -print WhereIs('xxx.exe', %s) -print WhereIs('xxx.exe', %s) -print WhereIs('xxx.exe', %s, reject=%s) +print(WhereIs('xxx.exe')) +print(WhereIs('xxx.exe', %s)) +print(env.WhereIs('xxx.exe', %s)) +print(WhereIs('xxx.exe', %s)) +print(WhereIs('xxx.exe', %s)) +print(WhereIs('xxx.exe', %s, reject=%s)) env.Replace( XXXNAME='xxx.exe' ) -print env.WhereIs( '$XXXNAME', %s ) +print(env.WhereIs( '$XXXNAME', %s )) """ % (subdir_SConscript, repr(os.pathsep.join(pathdirs_1234)), repr(os.pathsep.join(pathdirs_1243)), @@ -87,11 +87,11 @@ print env.WhereIs( '$XXXNAME', %s ) test.write(subdir_SConscript, """ env = Environment() -print WhereIs('xxx.exe') -print WhereIs('xxx.exe', %s) -print env.WhereIs('xxx.exe', %s) -print WhereIs('xxx.exe', %s) -print WhereIs('xxx.exe', %s) +print(WhereIs('xxx.exe')) +print(WhereIs('xxx.exe', %s)) +print(env.WhereIs('xxx.exe', %s)) +print(WhereIs('xxx.exe', %s)) +print(WhereIs('xxx.exe', %s)) """ % (repr(os.pathsep.join(pathdirs_1234)), repr(os.pathsep.join(pathdirs_1243)), repr(pathdirs_1234), diff --git a/test/_CPPINCFLAGS.py b/test/_CPPINCFLAGS.py index ccf5e79..c5096ba 100644 --- a/test/_CPPINCFLAGS.py +++ b/test/_CPPINCFLAGS.py @@ -39,9 +39,9 @@ env=Environment(CPPPATH=['tmp'], INCPREFIX='-I') d=Entry('foo.d') e=Entry('foo.e') f=File('foo.f') -print env.subst('$_CPPINCFLAGS', target=e, source=f) -print env.subst('$_CPPINCFLAGS', target=d, source=f) -print env.subst('$_CPPINCFLAGS', target=f, source=d) +print(env.subst('$_CPPINCFLAGS', target=e, source=f)) +print(env.subst('$_CPPINCFLAGS', target=d, source=f)) +print(env.subst('$_CPPINCFLAGS', target=f, source=d)) """) expect = """\ diff --git a/test/custom-concat.py b/test/custom-concat.py index 56c7f64..730e6cd 100644 --- a/test/custom-concat.py +++ b/test/custom-concat.py @@ -44,7 +44,7 @@ env1 = Environment(MYFLAGS=myflags, _concat = my_concat1, MYPREFIX='p', MYSUFFIX='s', STRIPPREFIX='xxx', STRIPSUFFIX='yyy', LIST=['a', 'xxxb', 'cyyy', 'd']) -print env1.subst('$MYFLAGS') +print(env1.subst('$MYFLAGS')) """) expect = test.wrap_stdout(read_str = "mypas1 mypbs1 mypcs1 mypds1\n", diff --git a/test/exitfns.py b/test/exitfns.py index f64969b..d1bda3a 100644 --- a/test/exitfns.py +++ b/test/exitfns.py @@ -32,11 +32,11 @@ sconstruct = """ from SCons.exitfuncs import * def x1(): - print "running x1" + print("running x1") def x2(n): - print "running x2(%s)" % repr(n) + print("running x2(%s)" % repr(n)) def x3(n, kwd=None): - print "running x3(%s, kwd=%s)" % (repr(n), repr(kwd)) + print("running x3(%s, kwd=%s)" % (repr(n), repr(kwd))) register(x3, "no kwd args") register(x1) diff --git a/test/import.py b/test/import.py index d1e1ecf..c23657a 100644 --- a/test/import.py +++ b/test/import.py @@ -21,7 +21,6 @@ # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -from __future__ import print_function __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" @@ -64,7 +63,7 @@ platforms = [ for platform in platforms: test.write('SConstruct', """ -print "Platform %(platform)s" +print("Platform %(platform)s") env = Environment(platform = '%(platform)s') import SCons.Platform.%(platform)s x = SCons.Platform.%(platform)s.generate @@ -151,7 +150,7 @@ error_output = { # An SConstruct for importing Tool names that have illegal characters # for Python variable names. indirect_import = """\ -print "Tool %(tool)s (indirect)" +print("Tool %(tool)s (indirect)") env = Environment(tools = ['%(tool)s']) SCons = __import__('SCons.Tool.%(tool)s', globals(), locals(), []) @@ -162,7 +161,7 @@ m.generate(env) # An SConstruct for importing Tool names "normally." direct_import = """\ -print "Tool %(tool)s (direct)" +print("Tool %(tool)s (direct)") env = Environment(tools = ['%(tool)s']) import SCons.Tool.%(tool)s diff --git a/test/no-arguments.py b/test/no-arguments.py index e447ff6..953d827 100644 --- a/test/no-arguments.py +++ b/test/no-arguments.py @@ -40,7 +40,7 @@ test.write('SConstruct', r""" def cat(env, source, target): target = str(target[0]) source = list(map(str, source)) - print 'cat(%s) > %s' % (source, target) + print('cat(%s) > %s' % (source, target)) f = open(target, "wb") for src in source: f.write(open(src, "rb").read()) diff --git a/test/option--C.py b/test/option--C.py index 27f4950..1df3c1a 100644 --- a/test/option--C.py +++ b/test/option--C.py @@ -51,18 +51,18 @@ test.subdir('sub', ['sub', 'dir']) test.write('SConstruct', """ import os -print "SConstruct", os.getcwd() +print("SConstruct", os.getcwd()) """) test.write(['sub', 'SConstruct'], """ import os -print GetBuildPath('..') +print(GetBuildPath('..')) """) test.write(['sub', 'dir', 'SConstruct'], """ import os env = Environment(FOO='foo', BAR='bar') -print env.GetBuildPath('../$FOO/$BAR') +print(env.GetBuildPath('../$FOO/$BAR')) """) test.run(arguments = '-C sub .', diff --git a/test/option--I.py b/test/option--I.py index d65349a..0ca262d 100644 --- a/test/option--I.py +++ b/test/option--I.py @@ -44,9 +44,9 @@ variable = "sub2/bar" test.write('SConstruct', """ import foo -print foo.variable +print(foo.variable) import bar -print bar.variable +print(bar.variable) """) test.run(arguments = '-I sub1 -I sub2 .', diff --git a/test/option-f.py b/test/option-f.py index 2a238d3..9fd1a57 100644 --- a/test/option-f.py +++ b/test/option-f.py @@ -36,17 +36,17 @@ subdir_BuildThis = os.path.join('subdir', 'Buildthis') test.write('SConscript', """ import os -print "SConscript " + os.getcwd() +print("SConscript " + os.getcwd()) """) test.write(subdir_BuildThis, """ import os -print "subdir/BuildThis", os.getcwd() +print("subdir/BuildThis", os.getcwd()) """) test.write('Build2', """ import os -print "Build2", os.getcwd() +print("Build2", os.getcwd()) """) wpath = test.workpath() @@ -85,7 +85,7 @@ test.run(arguments = '--sconstruct=%s .' % subdir_BuildThis, test.run(arguments = '-f - .', stdin = """ import os -print "STDIN " + os.getcwd() +print("STDIN " + os.getcwd()) """, stdout = test.wrap_stdout(read_str = 'STDIN %s\n' % wpath, build_str = "scons: `.' is up to date.\n")) diff --git a/test/overrides.py b/test/overrides.py index d706ab7..69d5207 100644 --- a/test/overrides.py +++ b/test/overrides.py @@ -35,9 +35,9 @@ _python_ = TestSCons._python_ test.write('SConstruct', """ env = Environment(CCFLAGS='-DFOO', LIBS=['a']) def build(target, source, env): - print "env['CC'] =", env['CC'] - print "env['CCFLAGS'] =", env['CCFLAGS'] - print "env['LIBS'] =", env['LIBS'] + print("env['CC'] =", env['CC']) + print("env['CCFLAGS'] =", env['CCFLAGS']) + print("env['LIBS'] =", env['LIBS']) builder = Builder(action=build, CC='buildcc', LIBS='buildlibs') env['BUILDERS']['Build'] = builder diff --git a/test/preserve-source.py b/test/preserve-source.py index 6e09073..b7eccd1 100644 --- a/test/preserve-source.py +++ b/test/preserve-source.py @@ -35,7 +35,7 @@ test.write('SConstruct', r""" def cat(env, source, target): target = str(target[0]) source = list(map(str, source)) - print 'cat(%s) > %s' % (source, target) + print('cat(%s) > %s' % (source, target)) f = open(target, "wb") for src in source: f.write(open(src, "rb").read()) diff --git a/test/site_scons/basic.py b/test/site_scons/basic.py index 1868723..b3ae9f2 100644 --- a/test/site_scons/basic.py +++ b/test/site_scons/basic.py @@ -40,7 +40,7 @@ test.subdir('site_scons', ['site_scons', 'site_tools']) test.write(['site_scons', 'site_init.py'], """ from SCons.Script import * -print "Hi there, I am in site_scons/site_init.py!" +print("Hi there, I am in site_scons/site_init.py!") """) test.write(['site_scons', 'site_tools', 'mytool.py'], """ @@ -54,7 +54,7 @@ def exists(env): test.write('SConstruct', """ e=Environment(tools=['default', 'mytool']) -print e.subst('My site tool is $MYTOOL') +print(e.subst('My site tool is $MYTOOL')) """) test.run(arguments = '-Q .', diff --git a/test/site_scons/no-site-dir.py b/test/site_scons/no-site-dir.py index d01d419..c31ec94 100644 --- a/test/site_scons/no-site-dir.py +++ b/test/site_scons/no-site-dir.py @@ -37,7 +37,7 @@ test.subdir('site_scons', ['site_scons', 'site_tools']) test.write(['site_scons', 'site_init.py'], """ from SCons.Script import * -print "Hi there, I am in site_scons/site_init.py!" +print("Hi there, I am in site_scons/site_init.py!") """) test.write(['site_scons', 'site_tools', 'mytool.py'], """ @@ -68,7 +68,7 @@ test.run(arguments = '-Q --no-site-dir .', test.write('SConstruct', """ e=Environment() -print e.subst('no site: M4 is $M4, M4_MINE is $M4_MINE') +print(e.subst('no site: M4 is $M4, M4_MINE is $M4_MINE')) """) test.run(arguments = '-Q --no-site-dir .') diff --git a/test/site_scons/override.py b/test/site_scons/override.py index e33bb88..d65c09e 100644 --- a/test/site_scons/override.py +++ b/test/site_scons/override.py @@ -49,7 +49,7 @@ def exists(env): test.write('SConstruct', """ e=Environment(tools=['m4']) -print e.subst('M4 is $M4, M4_MINE is $M4_MINE') +print(e.subst('M4 is $M4, M4_MINE is $M4_MINE')) """) test.run(arguments = '-Q .', stdout = """M4 is my_m4, M4_MINE is 1 diff --git a/test/site_scons/site-dir.py b/test/site_scons/site-dir.py index 8e82e94..d60e7d9 100644 --- a/test/site_scons/site-dir.py +++ b/test/site_scons/site-dir.py @@ -38,7 +38,7 @@ test.subdir('site_scons', ['site_scons', 'site_tools']) test.write(['site_scons', 'site_init.py'], """ from SCons.Script import * -print "Hi there, I am in site_scons/site_init.py!" +print("Hi there, I am in site_scons/site_init.py!") """) test.write(['site_scons', 'site_tools', 'mytool.py'], """ @@ -55,7 +55,7 @@ test.subdir('alt_site', ['alt_site', 'site_tools']) test.write(['alt_site', 'site_init.py'], """ from SCons.Script import * -print "Hi there, I am in alt_site/site_init.py!" +print("Hi there, I am in alt_site/site_init.py!") """) test.write('SConstruct', """ diff --git a/test/site_scons/site_init.py b/test/site_scons/site_init.py index 45201ac..27768a9 100644 --- a/test/site_scons/site_init.py +++ b/test/site_scons/site_init.py @@ -58,10 +58,10 @@ for x in list(globals().keys()): continue special.append(x) -print sorted(special) -print __doc__ -print os.path.realpath(__file__) -print __name__ +print(sorted(special)) +print(__doc__) +print(os.path.realpath(__file__)) +print(__name__) """) test.write('SConstruct', "\n") |