diff options
author | William Blevins <wblevins001@gmail.com> | 2016-11-27 21:27:10 -0500 |
---|---|---|
committer | William Blevins <wblevins001@gmail.com> | 2016-11-27 21:27:10 -0500 |
commit | 9dcdab8bda6c975a3c4965179cc9bbacbbae3e1a (patch) | |
tree | 52c998b0a8faf434f306c5498199e6ba468ff261 /test/SideEffect | |
parent | 8c1bbc45bbdc236867221ca2e17b2f7257c9bad8 (diff) | |
download | scons-9dcdab8bda6c975a3c4965179cc9bbacbbae3e1a.tar.gz |
Python3 test fixes for Fortran/Side-effect.
Diffstat (limited to 'test/SideEffect')
-rw-r--r-- | test/SideEffect/basic.py | 2 | ||||
-rw-r--r-- | test/SideEffect/parallel.py | 4 | ||||
-rw-r--r-- | test/SideEffect/variant_dir.py | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/test/SideEffect/basic.py b/test/SideEffect/basic.py index 0ded6b69..af6c264b 100644 --- a/test/SideEffect/basic.py +++ b/test/SideEffect/basic.py @@ -43,7 +43,7 @@ def build(env, source, target): copy(str(source[0]), str(target[0])) if target[0].side_effects: side_effect = open(str(target[0].side_effects[0]), "ab") - side_effect.write('%%s -> %%s\\n'%%(str(source[0]), str(target[0]))) + side_effect.write(('%%s -> %%s\\n'%%(str(source[0]), str(target[0]))).encode()) Build = Builder(action=build) env = Environment(BUILDERS={'Build':Build}, SUBDIR='subdir') diff --git a/test/SideEffect/parallel.py b/test/SideEffect/parallel.py index ff883c47..f750903e 100644 --- a/test/SideEffect/parallel.py +++ b/test/SideEffect/parallel.py @@ -45,14 +45,14 @@ logfile = 'log.txt' try: os.mkdir(lockdir) -except OSError, e: +except OSError as e: msg = 'could not create lock directory: %s\\n' % e sys.stderr.write(msg) sys.exit(1) src, target = sys.argv[1:] -open(logfile, 'ab').write('%s -> %s\\n' % (src, target)) +open(logfile, 'ab').write(('%s -> %s\\n' % (src, target)).encode()) # Give the other threads a chance to start. time.sleep(1) diff --git a/test/SideEffect/variant_dir.py b/test/SideEffect/variant_dir.py index cc7b8e98..711e4266 100644 --- a/test/SideEffect/variant_dir.py +++ b/test/SideEffect/variant_dir.py @@ -44,7 +44,7 @@ def build(env, source, target): copy(str(source[0]), str(target[0])) if target[0].side_effects: side_effect = open(str(target[0].side_effects[0]), "ab") - side_effect.write('%s -> %s\\n'%(str(source[0]), str(target[0]))) + side_effect.write(('%s -> %s\\n'%(str(source[0]), str(target[0]))).encode()) Build = Builder(action=build) env = Environment(BUILDERS={'Build':Build}) |