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

6 files changed, 27 insertions, 27 deletions

diff --git a/test/Rpcgen/RPCGEN.py b/test/Rpcgen/RPCGEN.py
index f79e18e7..2f793e28 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 9440d57f..96129527 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 b94ffe51..d4be92c4 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 f65da8e8..4beca643 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 a956d4f9..7644485d 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 0dc1366d..41da70c5 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')