diff options
author | Russel Winder <russel@winder.org.uk> | 2016-01-01 16:21:10 (GMT) |
---|---|---|
committer | Russel Winder <russel@winder.org.uk> | 2016-01-01 16:21:10 (GMT) |
commit | 7a6018983cf716374f2c7bf3b48e3f386bcaadd9 (patch) | |
tree | c6df1e880ccd1897ce0bec1476e6b1e588454637 | |
parent | 3f637329635c089bdca30bb4b0e23334d12866b3 (diff) | |
download | SCons-7a6018983cf716374f2c7bf3b48e3f386bcaadd9.zip SCons-7a6018983cf716374f2c7bf3b48e3f386bcaadd9.tar.gz SCons-7a6018983cf716374f2c7bf3b48e3f386bcaadd9.tar.bz2 |
Some more statement to function transforms.
-rw-r--r-- | QMTest/TestSCons.py | 12 | ||||
-rw-r--r-- | test/Repository/Default.py | 2 | ||||
-rw-r--r-- | test/Repository/Local.py | 4 | ||||
-rw-r--r-- | test/Repository/VariantDir.py | 2 | ||||
-rw-r--r-- | test/Repository/option-c.py | 2 | ||||
-rw-r--r-- | test/Repository/option-n.py | 2 | ||||
-rw-r--r-- | test/Repository/targets.py | 2 |
7 files changed, 13 insertions, 13 deletions
diff --git a/QMTest/TestSCons.py b/QMTest/TestSCons.py index d98b155..3857da5 100644 --- a/QMTest/TestSCons.py +++ b/QMTest/TestSCons.py @@ -929,7 +929,7 @@ if ARGUMENTS.get('variant_dir', 0): else: builddir = 'build' VariantDir(builddir, '.', duplicate=dup) - print builddir, dup + print(builddir, dup) sconscript = Dir(builddir).File('SConscript') else: sconscript = File('SConscript') @@ -1142,12 +1142,12 @@ except AttributeError: try: import distutils.sysconfig exec_prefix = distutils.sysconfig.EXEC_PREFIX - print distutils.sysconfig.get_python_inc() - print os.path.join(exec_prefix, 'libs') + print(distutils.sysconfig.get_python_inc()) + print(os.path.join(exec_prefix, 'libs')) except: - print os.path.join(sys.prefix, 'include', py_ver) - print os.path.join(sys.prefix, 'lib', py_ver, 'config') -print py_ver + print(os.path.join(sys.prefix, 'include', py_ver) + print(os.path.join(sys.prefix, 'lib', py_ver, 'config')) +print(py_ver) """) return [python] + self.stdout().strip().split('\n') diff --git a/test/Repository/Default.py b/test/Repository/Default.py index 127c29a..44aecfb 100644 --- a/test/Repository/Default.py +++ b/test/Repository/Default.py @@ -46,7 +46,7 @@ test.write(['repository', 'SConstruct'], r""" def copy(env, source, target): source = str(source[0]) target = str(target[0]) - print 'copy() < %s > %s' % (source, target) + print('copy() < %s > %s' % (source, target)) open(target, "wb").write(open(source, "rb").read()) Build = Builder(action=copy) diff --git a/test/Repository/Local.py b/test/Repository/Local.py index 1b63345..ea03281 100644 --- a/test/Repository/Local.py +++ b/test/Repository/Local.py @@ -48,7 +48,7 @@ test.write(['repository', 'SConstruct'], r""" def copy(env, source, target): source = str(source[0]) target = str(target[0]) - print 'copy() < %s > %s' % (source, target) + print('copy() < %s > %s' % (source, target)) open(target, "wb").write(open(source, "rb").read()) Build = Builder(action=copy) @@ -65,7 +65,7 @@ SConscript('build/SConscript') test.write(['repository', 'src', 'SConscript'], r""" def bbb_copy(env, source, target): target = str(target[0]) - print 'bbb_copy()' + print('bbb_copy()') open(target, "wb").write(open('build/bbb.1', "rb").read()) Import("env") diff --git a/test/Repository/VariantDir.py b/test/Repository/VariantDir.py index ec723c8..0258ff5 100644 --- a/test/Repository/VariantDir.py +++ b/test/Repository/VariantDir.py @@ -48,7 +48,7 @@ test.write(['repository', 'src', 'SConscript'], 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/Repository/option-c.py b/test/Repository/option-c.py index ea989c2..c06c7d8 100644 --- a/test/Repository/option-c.py +++ b/test/Repository/option-c.py @@ -65,7 +65,7 @@ test.write(['repository', 'SConstruct'], r""" def copy(env, source, target): source = str(source[0]) target = str(target[0]) - print 'copy() < %s > %s' % (source, target) + print('copy() < %s > %s' % (source, target)) open(target, "wb").write(open(source, "rb").read()) Build = Builder(action=copy) diff --git a/test/Repository/option-n.py b/test/Repository/option-n.py index 220baad..2a0ae5d 100644 --- a/test/Repository/option-n.py +++ b/test/Repository/option-n.py @@ -48,7 +48,7 @@ test.write(['repository', 'SConstruct'], r""" def copy(env, source, target): source = str(source[0]) target = str(target[0]) - print 'copy() < %s > %s' % (source, target) + print('copy() < %s > %s' % (source, target)) open(target, "wb").write(open(source, "rb").read()) Build = Builder(action=copy) diff --git a/test/Repository/targets.py b/test/Repository/targets.py index 62f4785..0fbc896 100644 --- a/test/Repository/targets.py +++ b/test/Repository/targets.py @@ -43,7 +43,7 @@ test.write(['repository', 'SConstruct'], """ 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()) |