summaryrefslogtreecommitdiffstats
path: root/test/Scanner
diff options
context:
space:
mode:
authorWilliam Deegan <bill@baddogconsulting.com>2017-03-20 00:26:53 (GMT)
committerWilliam Deegan <bill@baddogconsulting.com>2017-03-20 00:26:53 (GMT)
commit2c312564762cc54a119b74437566dc4aef4f7ca4 (patch)
tree9ad97c711ed03fadc24ce84d8b0f600b8eaca65b /test/Scanner
parentb0dbfb811f1408909d7587ae033139791e7509ca (diff)
downloadSCons-2c312564762cc54a119b74437566dc4aef4f7ca4.zip
SCons-2c312564762cc54a119b74437566dc4aef4f7ca4.tar.gz
SCons-2c312564762cc54a119b74437566dc4aef4f7ca4.tar.bz2
py2/3 fix rb/wb
Diffstat (limited to 'test/Scanner')
-rw-r--r--test/Scanner/dictionary.py6
-rw-r--r--test/Scanner/multi-env.py6
-rw-r--r--test/Scanner/source_scanner-dict.py6
3 files changed, 9 insertions, 9 deletions
diff --git a/test/Scanner/dictionary.py b/test/Scanner/dictionary.py
index a65e777..f6f121e 100644
--- a/test/Scanner/dictionary.py
+++ b/test/Scanner/dictionary.py
@@ -36,8 +36,8 @@ test = TestSCons.TestSCons()
test.write('build.py', r"""
import sys
-input = open(sys.argv[1], 'rb')
-output = open(sys.argv[2], 'wb')
+input = open(sys.argv[1], 'r')
+output = open(sys.argv[2], 'w')
include_prefix = 'include%s ' % sys.argv[1][-1]
@@ -45,7 +45,7 @@ def process(infp, outfp):
for line in infp.readlines():
if line[:len(include_prefix)] == include_prefix:
file = line[len(include_prefix):-1]
- process(open(file, 'rb'), outfp)
+ process(open(file, 'r'), outfp)
else:
outfp.write(line)
diff --git a/test/Scanner/multi-env.py b/test/Scanner/multi-env.py
index 3d9a62a..7cb052a 100644
--- a/test/Scanner/multi-env.py
+++ b/test/Scanner/multi-env.py
@@ -72,12 +72,12 @@ def process(infp, outfp):
l = len(prefix)
for line in infp.readlines():
if line[:l] == prefix:
- process(open(line[l:-1], 'rb'), outfp)
+ process(open(line[l:-1], 'r'), outfp)
else:
outfp.write(line)
-process(open(sys.argv[2], 'rb'),
- open(sys.argv[1], 'wb'))
+process(open(sys.argv[2], 'r'),
+ open(sys.argv[1], 'w'))
sys.exit(0)
"""
diff --git a/test/Scanner/source_scanner-dict.py b/test/Scanner/source_scanner-dict.py
index f796368..bb12364 100644
--- a/test/Scanner/source_scanner-dict.py
+++ b/test/Scanner/source_scanner-dict.py
@@ -39,9 +39,9 @@ test = TestSCons.TestSCons()
test.write('build.py', r"""
import sys
-output = open(sys.argv[1], 'wb')
+output = open(sys.argv[1], 'w')
for infile in sys.argv[2:]:
- input = open(infile, 'rb')
+ input = open(infile, 'r')
include_prefix = 'include%s ' % infile[-1]
@@ -49,7 +49,7 @@ for infile in sys.argv[2:]:
for line in infp.readlines():
if line[:len(include_prefix)] == include_prefix:
file = line[len(include_prefix):-1]
- process(open(file, 'rb'), outfp)
+ process(open(file, 'r'), outfp)
else:
outfp.write(line)