py2/3 fix mostly adding mode='r' to must_match

8 files changed, 40 insertions, 40 deletions

diff --git a/test/DVIPDF/DVIPDFFLAGS.py b/test/DVIPDF/DVIPDFFLAGS.py
index 51a4c42..b8c53c9 100644
--- a/test/DVIPDF/DVIPDFFLAGS.py
+++ b/test/DVIPDF/DVIPDFFLAGS.py
@@ -100,9 +100,9 @@ test.write('test2.tex', r"""This is a .tex test.
 
 test.run(arguments = '.', stderr = None)
 
-test.must_match('test1.pdf', " -x\nThis is a .dvi test.\n")
+test.must_match('test1.pdf', " -x\nThis is a .dvi test.\n", mode='r')
 
-test.must_match('test2.pdf', " -x\nThis is a .tex test.\n")
+test.must_match('test2.pdf', " -x\nThis is a .tex test.\n", mode='r')
 
 
 
@@ -149,21 +149,21 @@ This is the %s LaTeX file.
 
     test.write('bar.tex', tex % 'bar.tex')
 
-    test.run(arguments = 'foo.pdf', stderr = None)
+    test.run(arguments='foo.pdf', stderr=None)
 
     test.must_not_exist(test.workpath('wrapper.out'))
 
     test.must_exist(test.workpath('foo.pdf'))
 
-    test.run(arguments = 'xxx.pdf', stderr = None)
+    test.run(arguments='xxx.pdf', stderr=None)
 
     test.must_not_exist(test.workpath('wrapper.out'))
 
     test.must_not_exist(test.workpath('xxx.dvi'))
 
-    test.run(arguments = 'bar.pdf', stderr = None)
+    test.run(arguments='bar.pdf', stderr=None)
 
-    test.must_match('wrapper.out', "dvipdf bar.dvi bar.pdf\n")
+    test.must_match('wrapper.out', "dvipdf bar.dvi bar.pdf\n", mode='r')
 
     test.must_exist(test.workpath('bar.pdf'))
 
diff --git a/test/DVIPS/DVIPSFLAGS.py b/test/DVIPS/DVIPSFLAGS.py
index 7aedf24..814c8aa 100644
--- a/test/DVIPS/DVIPSFLAGS.py
+++ b/test/DVIPS/DVIPSFLAGS.py
@@ -112,13 +112,13 @@ test.write('test4.latex', r"""This is a .latex test.
 
 test.run(arguments = '.', stderr = None)
 
-test.must_match('test1.ps', " -x\nThis is a .dvi test.\n")
+test.must_match('test1.ps', " -x\nThis is a .dvi test.\n", mode='r')
 
-test.must_match('test2.ps', " -x\nThis is a .tex test.\n")
+test.must_match('test2.ps', " -x\nThis is a .tex test.\n", mode='r')
 
-test.must_match('test3.ps', " -x\nThis is a .ltx test.\n")
+test.must_match('test3.ps', " -x\nThis is a .ltx test.\n", mode='r')
 
-test.must_match('test4.ps', " -x\nThis is a .latex test.\n")
+test.must_match('test4.ps', " -x\nThis is a .latex test.\n", mode='r')
 
 
 dvips = test.where_is('dvips')
@@ -161,20 +161,20 @@ This is the %s LaTeX file.
     test.write('bar2.ltx', latex % 'bar2.ltx')
     test.write('bar3.latex', latex % 'bar3.latex')
 
-    test.run(arguments = 'foo.dvi', stderr = None)
+    test.run(arguments='foo.dvi', stderr=None)
 
     test.must_not_exist(test.workpath('wrapper.out'))
 
     test.must_exist(test.workpath('foo.dvi'))
 
-    test.run(arguments = 'bar1.ps bar2.ps bar3.ps', stderr = None)
+    test.run(arguments='bar1.ps bar2.ps bar3.ps', stderr=None)
 
     expect = """dvips -o bar1.ps bar1.dvi
 dvips -o bar2.ps bar2.dvi
 dvips -o bar3.ps bar3.dvi
 """
 
-    test.must_match('wrapper.out', expect)
+    test.must_match('wrapper.out', expect, mode='r')
 
     test.must_exist(test.workpath('bar1.ps'))
     test.must_exist(test.workpath('bar2.ps'))
diff --git a/test/Rpcgen/RPCGEN.py b/test/Rpcgen/RPCGEN.py
index f79e18e..2f793e2 100644
--- a/test/Rpcgen/RPCGEN.py
+++ b/test/Rpcgen/RPCGEN.py
@@ -26,10 +26,10 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import TestSCons
 
-_python_ = TestSCons._python_
-_exe = TestSCons._exe
+_python_=TestSCons._python_
+_exe=TestSCons._exe
 
-test = TestSCons.TestSCons()
+test=TestSCons.TestSCons()
 
 
 
@@ -68,10 +68,10 @@ expect_h = output % ('-h', test.workpath('rpcif.h'))
 expect_svc = output % ('-m', test.workpath('rpcif_svc.c'))
 expect_xdr = output % ('-c', test.workpath('rpcif_xdr.c'))
 
-test.must_match('rpcif_clnt.c', expect_clnt)
-test.must_match('rpcif.h', expect_h)
-test.must_match('rpcif_svc.c', expect_svc)
-test.must_match('rpcif_xdr.c', expect_xdr)
+test.must_match('rpcif_clnt.c', expect_clnt, mode='r')
+test.must_match('rpcif.h', expect_h, mode='r')
+test.must_match('rpcif_svc.c', expect_svc, mode='r')
+test.must_match('rpcif_xdr.c', expect_xdr, mode='r')
 
 
 
diff --git a/test/Rpcgen/RPCGENCLIENTFLAGS.py b/test/Rpcgen/RPCGENCLIENTFLAGS.py
index 9440d57..9612952 100644
--- a/test/Rpcgen/RPCGENCLIENTFLAGS.py
+++ b/test/Rpcgen/RPCGENCLIENTFLAGS.py
@@ -71,10 +71,10 @@ expect_h        = output      % ('-h', test.workpath('rpcif.h'))
 expect_svc      = output      % ('-m', test.workpath('rpcif_svc.c'))
 expect_xdr      = output      % ('-c', test.workpath('rpcif_xdr.c'))
 
-test.must_match('rpcif_clnt.c', expect_clnt)
-test.must_match('rpcif.h',      expect_h)
-test.must_match('rpcif_svc.c',  expect_svc)
-test.must_match('rpcif_xdr.c',  expect_xdr)
+test.must_match('rpcif_clnt.c', expect_clnt, mode='r')
+test.must_match('rpcif.h',      expect_h, mode='r')
+test.must_match('rpcif_svc.c',  expect_svc, mode='r')
+test.must_match('rpcif_xdr.c',  expect_xdr, mode='r')
 
 
 
diff --git a/test/Rpcgen/RPCGENFLAGS.py b/test/Rpcgen/RPCGENFLAGS.py
index b94ffe5..d4be92c 100644
--- a/test/Rpcgen/RPCGENFLAGS.py
+++ b/test/Rpcgen/RPCGENFLAGS.py
@@ -70,10 +70,10 @@ expect_h = output % ('-h', test.workpath('rpcif.h'))
 expect_svc = output % ('-m', test.workpath('rpcif_svc.c'))
 expect_xdr = output % ('-c', test.workpath('rpcif_xdr.c'))
 
-test.must_match('rpcif_clnt.c', expect_clnt)
-test.must_match('rpcif.h', expect_h)
-test.must_match('rpcif_svc.c', expect_svc)
-test.must_match('rpcif_xdr.c', expect_xdr)
+test.must_match('rpcif_clnt.c', expect_clnt, mode='r')
+test.must_match('rpcif.h', expect_h, mode='r')
+test.must_match('rpcif_svc.c', expect_svc, mode='r')
+test.must_match('rpcif_xdr.c', expect_xdr, mode='r')
 
 
 
diff --git a/test/Rpcgen/RPCGENHEADERFLAGS.py b/test/Rpcgen/RPCGENHEADERFLAGS.py
index f65da8e..4beca64 100644
--- a/test/Rpcgen/RPCGENHEADERFLAGS.py
+++ b/test/Rpcgen/RPCGENHEADERFLAGS.py
@@ -71,10 +71,10 @@ expect_h        = output_h % ('-h', test.workpath('rpcif.h'))
 expect_svc      = output   % ('-m', test.workpath('rpcif_svc.c'))
 expect_xdr      = output   % ('-c', test.workpath('rpcif_xdr.c'))
 
-test.must_match('rpcif_clnt.c', expect_clnt)
-test.must_match('rpcif.h',      expect_h)
-test.must_match('rpcif_svc.c',  expect_svc)
-test.must_match('rpcif_xdr.c',  expect_xdr)
+test.must_match('rpcif_clnt.c', expect_clnt, mode='r')
+test.must_match('rpcif.h',      expect_h, mode='r')
+test.must_match('rpcif_svc.c',  expect_svc, mode='r')
+test.must_match('rpcif_xdr.c',  expect_xdr, mode='r')
 
 
 
diff --git a/test/Rpcgen/RPCGENSERVICEFLAGS.py b/test/Rpcgen/RPCGENSERVICEFLAGS.py
index a956d4f..7644485 100644
--- a/test/Rpcgen/RPCGENSERVICEFLAGS.py
+++ b/test/Rpcgen/RPCGENSERVICEFLAGS.py
@@ -71,10 +71,10 @@ expect_h        = output     % ('-h', test.workpath('rpcif.h'))
 expect_svc      = output_svc % ('-m', test.workpath('rpcif_svc.c'))
 expect_xdr      = output     % ('-c', test.workpath('rpcif_xdr.c'))
 
-test.must_match('rpcif_clnt.c', expect_clnt)
-test.must_match('rpcif.h',      expect_h)
-test.must_match('rpcif_svc.c',  expect_svc)
-test.must_match('rpcif_xdr.c',  expect_xdr)
+test.must_match('rpcif_clnt.c', expect_clnt, mode='r')
+test.must_match('rpcif.h',      expect_h, mode='r')
+test.must_match('rpcif_svc.c',  expect_svc, mode='r')
+test.must_match('rpcif_xdr.c',  expect_xdr, mode='r')
 
 
 
diff --git a/test/Rpcgen/RPCGENXDRFLAGS.py b/test/Rpcgen/RPCGENXDRFLAGS.py
index 0dc1366..41da70c 100644
--- a/test/Rpcgen/RPCGENXDRFLAGS.py
+++ b/test/Rpcgen/RPCGENXDRFLAGS.py
@@ -71,10 +71,10 @@ expect_h        = output     % ('-h', test.workpath('rpcif.h'))
 expect_svc      = output     % ('-m', test.workpath('rpcif_svc.c'))
 expect_xdr      = output_xdr % ('-c', test.workpath('rpcif_xdr.c'))
 
-test.must_match('rpcif_clnt.c', expect_clnt)
-test.must_match('rpcif.h',      expect_h)
-test.must_match('rpcif_svc.c',  expect_svc)
-test.must_match('rpcif_xdr.c',  expect_xdr)
+test.must_match('rpcif_clnt.c', expect_clnt, mode='r')
+test.must_match('rpcif.h',      expect_h, mode='r')
+test.must_match('rpcif_svc.c',  expect_svc, mode='r')
+test.must_match('rpcif_xdr.c',  expect_xdr, mode='r')