py2/3 byte fixes

4 files changed, 13 insertions, 13 deletions

diff --git a/test/Scanner/FindPathDirs.py b/test/Scanner/FindPathDirs.py
index ef3ea46d..7f8b993e 100644
--- a/test/Scanner/FindPathDirs.py
+++ b/test/Scanner/FindPathDirs.py
@@ -41,14 +41,14 @@ test.write('build.py', r"""
 import os.path
 import sys
 path = sys.argv[1].split()
-input = open(sys.argv[2], 'rb')
-output = open(sys.argv[3], 'wb')
+input = open(sys.argv[2], 'r')
+output = open(sys.argv[3], 'w')
 
 def find_file(f):
     for dir in path:
         p = dir + os.sep + f
         if os.path.exists(p):
-            return open(p, 'rb')
+            return open(p, 'r')
     return None
 
 def process(infp, outfp):
diff --git a/test/Scanner/Scanner.py b/test/Scanner/Scanner.py
index 8d48b730..625b3729 100644
--- a/test/Scanner/Scanner.py
+++ b/test/Scanner/Scanner.py
@@ -32,14 +32,14 @@ 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')
 
 def process(infp, outfp):
     for line in infp.readlines():
         if line[:8] == 'include ':
             file = line[8:-1]
-            process(open(file, 'rb'), outfp)
+            process(open(file, 'r'), outfp)
         elif line[:8] == 'getfile ':
             outfp.write('include ')
             outfp.write(line[8:])
@@ -114,7 +114,7 @@ bar = env.BarBld(target='bar', source='bar.in')
 # automatically applied to targets generated from that Builder
 
 def blork(env, target, source):
-    open(str(target[0]), 'wb').write(
+    open(str(target[0]), 'w').write(
         source[0].get_text_contents().replace('getfile', 'MISSEDME'))
 
 kbld = Builder(action=r'%(_python_)s build.py $SOURCES $TARGET',
diff --git a/test/Scanner/generated.py b/test/Scanner/generated.py
index 7246cbe4..9dd2a86b 100644
--- a/test/Scanner/generated.py
+++ b/test/Scanner/generated.py
@@ -301,7 +301,7 @@ import os
 Scanned = {}
 
 def write_out(file, dict):
-    f = open(file, 'wb')
+    f = open(file, 'w')
     for k in sorted(dict.keys()):
         file = os.path.split(k)[1]
         f.write(file + ": " + str(dict[k]) + "\\n")
diff --git a/test/Scanner/no-Dir-node.py b/test/Scanner/no-Dir-node.py
index 3a918bff..123764e8 100644
--- a/test/Scanner/no-Dir-node.py
+++ b/test/Scanner/no-Dir-node.py
@@ -54,16 +54,16 @@ test.write('build.py', r"""
 import os.path
 import sys
 path = sys.argv[1].split()
-input = open(sys.argv[2], 'rb')
-output = open(sys.argv[3], 'wb')
+input = open(sys.argv[2], 'r')
+output = open(sys.argv[3], 'w')
 
 def find_file(f):
     if os.path.isabs(f):
-        return open(f, 'rb')
+        return open(f, 'r')
     for dir in path:
         p = dir + os.sep + f
         if os.path.exists(p):
-            return open(p, 'rb')
+            return open(p, 'r')
     return None
 
 def process(infp, outfp):
@@ -81,7 +81,7 @@ sys.exit(0)
 
 test.write('SConstruct', """\
 def foo(target, source, env):
-    fp = open(str(target[0]), 'wb')
+    fp = open(str(target[0]), 'w')
     for c in sorted(source[0].children(), key=lambda t: t.name):
         fp.write('%s\\n' % c)
     fp.close()