Merged in bdbaddog/scons (pull request #419)

More py2/py3 fixes.

1 files changed, 3 insertions, 1 deletions

diff --git a/test/Scanner/unicode.py b/test/Scanner/unicode.py
index 2737f7db..c6985322 100644
--- a/test/Scanner/unicode.py
+++ b/test/Scanner/unicode.py
@@ -56,6 +56,8 @@ def process(outfp, infile):
         contents = contents[len(codecs.BOM_UTF16_LE):].decode('utf-16-le')
     elif contents.startswith(codecs.BOM_UTF16_BE):
         contents = contents[len(codecs.BOM_UTF16_BE):].decode('utf-16-be')
+    else:
+        contents = contents.decode('ascii')
     for line in contents.split('\n')[:-1]:
         if line[:8] == 'include ':
             process(outfp, line[8:])
@@ -65,7 +67,7 @@ def process(outfp, infile):
         else:
             outfp.write(line + '\n')
 
-output = open(sys.argv[2], 'wb')
+output = open(sys.argv[2], 'w')
 process(output, sys.argv[1])
 
 sys.exit(0)