From b7749493e21490935398ca359c70eb5f8546ea62 Mon Sep 17 00:00:00 2001
From: William Deegan <bill@baddogconsulting.com>
Date: Sun, 12 Mar 2017 21:31:17 -0400
Subject: py2/3 must_match mode='r' changes

---
 test/Java/JAR.py   | 14 +++++++-------
 test/Java/JAVAC.py |  6 +++---
 test/Java/JAVAH.py |  8 ++++----
 test/Java/RMIC.py  |  2 +-
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/test/Java/JAR.py b/test/Java/JAR.py
index a87b272..476bfcd 100644
--- a/test/Java/JAR.py
+++ b/test/Java/JAR.py
@@ -64,9 +64,9 @@ test1.class
 line 3
 """)
 
-test.run(arguments = '.', stderr = None)
+test.run(arguments='.', stderr=None)
 
-test.must_match('test1.jar', "test1.class\nline 3\n")
+test.must_match('test1.jar', "test1.class\nline 3\n", mode='r')
 
 if os.path.normcase('.class') == os.path.normcase('.CLASS'):
 
@@ -82,9 +82,9 @@ test2.CLASS
 line 3
 """)
 
-    test.run(arguments = '.', stderr = None)
+    test.run(arguments='.', stderr=None)
 
-    test.must_match('test2.jar', "test2.CLASS\nline 3\n")
+    test.must_match('test2.jar', "test2.CLASS\nline 3\n", mode='r')
 
 test.write('myjar2.py', r"""
 import sys
@@ -106,7 +106,7 @@ env.Jar(target = 'classes.jar', source = [ 'testdir/bar.class',
 """ % locals())
 
 test.subdir('testdir')
-test.write([ 'testdir', 'bar.class' ], 'foo')
+test.write(['testdir', 'bar.class'], 'foo')
 test.write('foo.mf',
            """Manifest-Version : 1.0
            blah
@@ -115,7 +115,7 @@ test.write('foo.mf',
            """)
 test.run(arguments='classes.jar')
 test.must_match('classes.jar',
-                'cvfm classes.jar foo.mf -C testdir bar.class\n')
+                'cvfm classes.jar foo.mf -C testdir bar.class\n', mode='r')
 
 
 
@@ -232,7 +232,7 @@ test.run(arguments = '.')
 expected_wrapper_out = "wrapper_with_args.py %(where_jar)s cf bar.jar classes/com/sub/bar\n"
 expected_wrapper_out = expected_wrapper_out.replace('/', os.sep)
 test.must_match('wrapper.out',
-                expected_wrapper_out % locals())
+                expected_wrapper_out % locals(), mode='r')
 
 test.must_exist('foo.jar')
 test.must_exist('bar.jar')
diff --git a/test/Java/JAVAC.py b/test/Java/JAVAC.py
index da42fc6..aaaa8f5 100644
--- a/test/Java/JAVAC.py
+++ b/test/Java/JAVAC.py
@@ -71,7 +71,7 @@ test1.java
 line 3
 """)
 
-test.run(arguments = '.', stderr = None)
+test.run(arguments='.', stderr=None)
 
 test.must_match('test1.class', "test1.java\nline 3\n", mode='r')
 
@@ -89,9 +89,9 @@ test2.JAVA
 line 3
 """)
 
-    test.run(arguments = '.', stderr = None)
+    test.run(arguments='.', stderr=None)
 
-    test.must_match('test2.class', "test2.JAVA\nline 3\n")
+    test.must_match('test2.class', "test2.JAVA\nline 3\n", mode='r')
 
 
 
diff --git a/test/Java/JAVAH.py b/test/Java/JAVAH.py
index 589a822..f07ebb9 100644
--- a/test/Java/JAVAH.py
+++ b/test/Java/JAVAH.py
@@ -70,9 +70,9 @@ test1.java
 line 3
 """)
 
-test.run(arguments = '.', stderr = None)
+test.run(arguments='.', stderr=None)
 
-test.must_match('test1.h', "test1.java\nline 3\n")
+test.must_match('test1.h', "test1.java\nline 3\n", mode='r')
 
 if os.path.normcase('.java') == os.path.normcase('.JAVA'):
 
@@ -88,9 +88,9 @@ test2.JAVA
 line 3
 """)
 
-    test.run(arguments = '.', stderr = None)
+    test.run(arguments='.', stderr=None)
 
-    test.must_match('test2.h', "test2.JAVA\nline 3\n")
+    test.must_match('test2.h', "test2.JAVA\nline 3\n", mode='r')
 
 
 where_javac, java_version = test.java_where_javac()
diff --git a/test/Java/RMIC.py b/test/Java/RMIC.py
index e94fda6..b29a466 100644
--- a/test/Java/RMIC.py
+++ b/test/Java/RMIC.py
@@ -89,7 +89,7 @@ line 3
 
     test.run(arguments = '.', stderr = None)
 
-    test.fail_test(test.read(['outdir', 'test2.class']) != "test2.JAVA\nline 3\n")
+    test.must_match(['outdir', 'test2.class'], "test2.JAVA\nline 3\n", mode='r')
 
 where_javac, java_version = test.java_where_javac()
 where_rmic = test.java_where_rmic()
-- 
cgit v0.12