py2/3 fix win32 py27 failures. Also resolve some py3 failures

2 files changed, 29 insertions, 29 deletions

diff --git a/test/explain/basic.py b/test/explain/basic.py
index fb331feb..ec7238e6 100644
--- a/test/explain/basic.py
+++ b/test/explain/basic.py
@@ -207,15 +207,15 @@ test.set_match_function(TestSCons.match_caseinsensitive)
 test.run(chdir='src', arguments=args, stdout=expect)
 test.set_match_function(TestSCons.match_exact)
 
-test.must_match(['src', 'file1'], "file1.in 1\n")
+test.must_match(['src', 'file1'], "file1.in 1\n", mode='r')
 test.must_match(['src', 'file2'], """\
 file2.k 1 line 1
 xxx 1
 yyy 1
 file2.k 1 line 4
-""")
-test.must_match(['src', 'file3'], "xxx 1\nyyy 1\nzzz 1\n")
-test.must_match(['src', 'file4'], "file4.in 1\n")
+""", mode='r')
+test.must_match(['src', 'file3'], "xxx 1\nyyy 1\nzzz 1\n", mode='r')
+test.must_match(['src', 'file4'], "file4.in 1\n", mode='r')
 test.must_match(['src', 'file5'], """\
 file5.k 1 line 1
 aaa 1
@@ -224,8 +224,8 @@ ccc 1
 ddd 1
 eee.in 1
 file5.k 1 line 4
-""")
-test.must_match(['src', 'file6'], "file6.in 1\n")
+""", mode='r')
+test.must_match(['src', 'file6'], "file6.in 1\n", mode='r')
 
 
 
@@ -262,21 +262,21 @@ test.set_match_function(TestSCons.match_caseinsensitive)
 test.run(chdir='src', arguments=args, stdout=expect)
 test.set_match_function(TestSCons.match_exact)
 
-test.must_match(['src', 'file1'], "file1.in 2\n")
+test.must_match(['src', 'file1'], "file1.in 2\n", mode='r')
 test.must_match(['src', 'file2'], """\
 file2.k 1 line 1
 xxx 1
 yyy 2
 file2.k 1 line 4
-""")
-test.must_match(['src', 'file3'], "xxx 1\nyyy 2\nzzz 2\n")
+""", mode='r')
+test.must_match(['src', 'file3'], "xxx 1\nyyy 2\nzzz 2\n", mode='r')
 test.must_match(['src', 'file5'], """\
 file5.k 1 line 1
 aaa 1
 bbb.k 2
 ccc 1
 file5.k 1 line 4
-""")
+""", mode='r')
 
 
 
@@ -294,7 +294,7 @@ test.set_match_function(TestSCons.match_caseinsensitive)
 test.run(chdir='src', arguments=args, stdout=expect)
 test.set_match_function(TestSCons.match_exact)
 
-test.must_match(['src', 'file3'], "xxx 1\nyyy 2\n")
+test.must_match(['src', 'file3'], "xxx 1\nyyy 2\n", mode='r')
 
 
 
@@ -312,7 +312,7 @@ test.set_match_function(TestSCons.match_caseinsensitive)
 test.run(chdir='src', arguments=args, stdout=expect)
 test.set_match_function(TestSCons.match_exact)
 
-test.must_match(['src', 'file3'], "xxx 1\nyyy 2\nzzz 2\n")
+test.must_match(['src', 'file3'], "xxx 1\nyyy 2\nzzz 2\n", mode='r')
 
 
 
@@ -334,7 +334,7 @@ test.set_match_function(TestSCons.match_caseinsensitive)
 test.run(chdir='src', arguments=args, stdout=expect)
 test.set_match_function(TestSCons.match_exact)
 
-test.must_match(['src', 'file3'], "zzz 2\nyyy 2\nxxx 1\n")
+test.must_match(['src', 'file3'], "zzz 2\nyyy 2\nxxx 1\n", mode='r')
 
 
 
@@ -361,9 +361,9 @@ test.set_match_function(TestSCons.match_caseinsensitive)
 test.run(chdir='src', arguments=args, stdout=expect)
 test.set_match_function(TestSCons.match_exact)
 
-test.must_match(['src', 'file3'], "zzz 2\nyyy 2\nxxx 1\n")
-test.must_match(['src', 'file3.alt'], "zzz 2\nyyy 2\nxxx 1\n")
-test.must_match(['src', 'file3.yyy'], "zzz 2\nyyy 2\nxxx 1\nyyy 2\n")
+test.must_match(['src', 'file3'], "zzz 2\nyyy 2\nxxx 1\n", mode='r')
+test.must_match(['src', 'file3.alt'], "zzz 2\nyyy 2\nxxx 1\n", mode='r')
+test.must_match(['src', 'file3.yyy'], "zzz 2\nyyy 2\nxxx 1\nyyy 2\n", mode='r')
 
 
 
@@ -392,9 +392,9 @@ test.set_match_function(TestSCons.match_caseinsensitive)
 test.run(chdir='src', arguments=args, stdout=expect)
 test.set_match_function(TestSCons.match_exact)
 
-test.must_match(['src', 'file3'], "zzz 2\nyyy 2\nxxx 1\n")
-test.must_match(['src', 'file3.alt'], "zzz 2\nyyy 2\nxxx 1\n")
-test.must_match(['src', 'file3.yyy'], "zzz 2\nyyy 2\nxxx 1\nxxx 1\n")
+test.must_match(['src', 'file3'], "zzz 2\nyyy 2\nxxx 1\n", mode='r')
+test.must_match(['src', 'file3.alt'], "zzz 2\nyyy 2\nxxx 1\n", mode='r')
+test.must_match(['src', 'file3.yyy'], "zzz 2\nyyy 2\nxxx 1\nxxx 1\n", mode='r')
 
 
 
@@ -415,7 +415,7 @@ test.set_match_function(TestSCons.match_caseinsensitive)
 test.run(chdir='src',arguments=args, stdout=expect)
 test.set_match_function(TestSCons.match_exact)
 
-test.must_match(['src', 'file4'], "file4.in 1\n")
+test.must_match(['src', 'file4'], "file4.in 1\n", mode='r')
 
 test.up_to_date(chdir='src',arguments='.')
 
diff --git a/test/explain/save-info.py b/test/explain/save-info.py
index 150d7ef0..048ee8d9 100644
--- a/test/explain/save-info.py
+++ b/test/explain/save-info.py
@@ -145,15 +145,15 @@ test.write(['src', 'subdir', 'file6.in'], "subdir/file6.in 1\n")
 #
 test.run(chdir='src', arguments='..')
 
-test.must_match(['src', 'file1'], "file1.in 1\n")
+test.must_match(['src', 'file1'], "file1.in 1\n", mode='r')
 test.must_match(['src', 'file2'], """\
 file2.k 1 line 1
 xxx 1
 yyy 1
 file2.k 1 line 4
-""")
-test.must_match(['src', 'file3'], "xxx 1\nyyy 1\nzzz 1\n")
-test.must_match(['src', 'file4'], "file4.in 1\n")
+""", mode='r')
+test.must_match(['src', 'file3'], "xxx 1\nyyy 1\nzzz 1\n", mode='r')
+test.must_match(['src', 'file4'], "file4.in 1\n", mode='r')
 test.must_match(['src', 'file5'], """\
 file5.k 1 line 1
 aaa 1
@@ -162,7 +162,7 @@ ccc 1
 ddd 1
 eee.in 1
 file5.k 1 line 4
-""")
+""", mode='r')
 
 test.write(['src', 'file1.in'], "file1.in 2\n")
 test.write(['src', 'yyy'], "yyy 2\n")
@@ -186,21 +186,21 @@ scons: rebuilding `file5' because `%(inc_bbb_k)s' changed
 
 test.run(chdir='src', arguments='--debug=explain .', stdout=expect)
 
-test.must_match(['src', 'file1'], "file1.in 2\n")
+test.must_match(['src', 'file1'], "file1.in 2\n", mode='r')
 test.must_match(['src', 'file2'], """\
 file2.k 1 line 1
 xxx 1
 yyy 2
 file2.k 1 line 4
-""")
-test.must_match(['src', 'file3'], "xxx 1\nyyy 2\nzzz 2\n")
+""", mode='r')
+test.must_match(['src', 'file3'], "xxx 1\nyyy 2\nzzz 2\n", mode='r')
 test.must_match(['src', 'file5'], """\
 file5.k 1 line 1
 aaa 1
 bbb.k 2
 ccc 1
 file5.k 1 line 4
-""")
+""", mode='r')