fix py2/3 mode=r and/rb, and remove native line ending translation. fixes win32

3 files changed, 18 insertions, 18 deletions

diff --git a/QMTest/TestSCons.py b/QMTest/TestSCons.py
index a8651d9..d33eae7 100644
--- a/QMTest/TestSCons.py
+++ b/QMTest/TestSCons.py
@@ -1028,7 +1028,7 @@ SConscript( sconscript )
                     nols = nols + "|"
             nols = nols + ")"
             lastEnd = 0
-            logfile = self.read(self.workpath(logfile),mode='r')
+            logfile = self.read(self.workpath(logfile))
 
             # Some debug code to keep around..
             # sys.stderr.write("LOGFILE[%s]:%s"%(type(logfile),logfile))
diff --git a/test/Configure/ConfigureDryRunError.py b/test/Configure/ConfigureDryRunError.py
index fa85042..b87162c 100644
--- a/test/Configure/ConfigureDryRunError.py
+++ b/test/Configure/ConfigureDryRunError.py
@@ -78,25 +78,25 @@ scons: *** Cannot update configure test "%(conftest_0_c)s" within a dry-run.
 test.run(arguments='-n', status=2, stderr=expect)
 
 test.run()
-test.checkLogAndStdout( ["Checking for C library %s... " % lib,
-                    "Checking for C library hopefullynolib... "],
-                    ["yes", "no"],
-                    [[((".c", NCR), (_obj, NCR))],
-                     [((".c", NCR), (_obj, NCF))]],
-                    "config.log", ".sconf_temp", "SConstruct")
+test.checkLogAndStdout(["Checking for C library %s... " % lib,
+                        "Checking for C library hopefullynolib... "],
+                       ["yes", "no"],
+                       [[((".c", NCR), (_obj, NCR))],
+                        [((".c", NCR), (_obj, NCF))]],
+                       "config.log", ".sconf_temp", "SConstruct")
 
-oldLog = test.read(test.workpath('config.log'))
+oldLog = test.read(test.workpath('config.log'), mode='r')
 
 test.run(arguments='-n')
-test.checkLogAndStdout( ["Checking for C library %s... " % lib,
-                    "Checking for C library hopefullynolib... "],
-                    ["yes", "no"],
-                    [[((".c", CR), (_obj, CR))],
-                     [((".c", CR), (_obj, CF))]],
-                    "config.log", ".sconf_temp", "SConstruct",
-                    doCheckLog=0)
-
-newLog = test.read(test.workpath('config.log'))
+test.checkLogAndStdout(["Checking for C library %s... " % lib,
+                        "Checking for C library hopefullynolib... "],
+                       ["yes", "no"],
+                       [[((".c", CR), (_obj, CR))],
+                        [((".c", CR), (_obj, CF))]],
+                       "config.log", ".sconf_temp", "SConstruct",
+                       doCheckLog=0)
+
+newLog = test.read(test.workpath('config.log'), mode='r')
 if newLog != oldLog:
     print("Unexpected update of log file within a dry run")
     test.fail_test()
diff --git a/test/Configure/config-h.py b/test/Configure/config-h.py
index ff5e5b2..a5c1998 100644
--- a/test/Configure/config-h.py
+++ b/test/Configure/config-h.py
@@ -130,7 +130,7 @@ expected_config_h = ("""\
 /* #undef HAVE_LIBHOPEFULLYNOLIB2 */
 
 #endif /* CONFIG_H_SEEN */
-""" % locals()).replace("\n", os.linesep)
+""" % locals())
 
 test.run(stdout=expected_stdout)