Fix broken tests

3 files changed, 26 insertions, 26 deletions

diff --git a/src/engine/SCons/Node/PythonTests.py b/src/engine/SCons/Node/PythonTests.py
index e2e36bf..346542b 100644
--- a/src/engine/SCons/Node/PythonTests.py
+++ b/src/engine/SCons/Node/PythonTests.py
@@ -90,15 +90,15 @@ class ValueTestCase(unittest.TestCase):
         """
         v1 = SCons.Node.Python.Value('aaa')
         csig = v1.get_csig(None)
-        assert csig == 'aaa', csig
+        assert csig.decode() == 'aaa', csig
 
         v2 = SCons.Node.Python.Value(7)
         csig = v2.get_csig(None)
-        assert csig == '7', csig
+        assert csig.decode() == '7', csig
 
         v3 = SCons.Node.Python.Value(None)
         csig = v3.get_csig(None)
-        assert csig == 'None', csig
+        assert csig.decode() == 'None', csig
 
 class ValueNodeInfoTestCase(unittest.TestCase):
     def test___init__(self):
diff --git a/src/engine/SCons/SConf.py b/src/engine/SCons/SConf.py
index 31d9402..889af4a 100644
--- a/src/engine/SCons/SConf.py
+++ b/src/engine/SCons/SConf.py
@@ -110,7 +110,7 @@ def _createConfigH(target, source, env):
 #define %(DEFNAME)s_SEEN
 
 """ % {'DEFNAME' : defname})
-    t.write(source[0].get_contents())
+    t.write(source[0].get_contents().decode())
     t.write("""
 #endif /* %(DEFNAME)s_SEEN */
 """ % {'DEFNAME' : defname})
@@ -164,11 +164,11 @@ class ConfigureCacheError(SConfError):
 # define actions for building text files
 def _createSource( target, source, env ):
     fd = open(str(target[0]), "w")
-    fd.write(source[0].get_contents())
+    fd.write(source[0].get_contents().decode())
     fd.close()
 def _stringSource( target, source, env ):
     return (str(target[0]) + ' <-\n  |' +
-            source[0].get_contents().replace( '\n', "\n  |" ) )
+            source[0].get_contents().decode().replace( '\n', "\n  |" ) )
 
 class SConfBuildInfo(SCons.Node.FS.FileBuildInfo):
     """
@@ -609,7 +609,7 @@ class SConfBase(object):
         ok = self.TryBuild(self.env.SConfActionBuilder, text, extension)
         del self.env['BUILDERS']['SConfActionBuilder']
         if ok:
-            outputStr = self.lastTarget.get_contents()
+            outputStr = self.lastTarget.get_contents().decode()
             return (1, outputStr)
         return (0, "")
 
diff --git a/src/engine/SCons/SConfTests.py b/src/engine/SCons/SConfTests.py
index b2aa3b4..0daf31c 100644
--- a/src/engine/SCons/SConfTests.py
+++ b/src/engine/SCons/SConfTests.py
@@ -48,7 +48,7 @@ class SConfTestCase(unittest.TestCase):
     def setUp(self):
         # we always want to start with a clean directory
         self.save_cwd = os.getcwd()
-        self.test = TestCmd.TestCmd(workdir = '') 
+        self.test = TestCmd.TestCmd(workdir = '')
         os.chdir(self.test.workpath(''))
 
     def tearDown(self):
@@ -109,7 +109,7 @@ class SConfTestCase(unittest.TestCase):
         # TryCompile and TryLink are much the same, so we can test them
         # in one method, we pass the function as a string ('TryCompile',
         # 'TryLink'), so we are aware of reloading modules.
-        
+
         def checks(self, sconf, TryFuncString):
             TryFunc = self.SConf.SConfBase.__dict__[TryFuncString]
             res1 = TryFunc( sconf, "int main() { return 0; }\n", ".c" )
@@ -128,7 +128,7 @@ class SConfTestCase(unittest.TestCase):
             assert res[0] and not res[1], res
         finally:
             sconf.Finish()
-            
+
         # 2.1 test the error caching mechanism (no dependencies have changed)
         self._resetSConfState()
         sconf = self.SConf.SConf(self.scons_env,
@@ -139,9 +139,9 @@ class SConfTestCase(unittest.TestCase):
             assert res[0] and not res[1], res
         finally:
             sconf.Finish()
-        # we should have exactly one one error cached 
+        # we should have exactly one one error cached
         log = str(self.test.read( self.test.workpath('config.log') ))
-        expr = re.compile( ".*failed in a previous run and all", re.DOTALL ) 
+        expr = re.compile( ".*failed in a previous run and all", re.DOTALL )
         firstOcc = expr.match( log )
         assert firstOcc is not None, log
         secondOcc = expr.match( log, firstOcc.end(0) )
@@ -239,11 +239,11 @@ class SConfTestCase(unittest.TestCase):
         """Test SConf.TryCompile
         """
         self._baseTryXXX( "TryCompile" ) #self.SConf.SConf.TryCompile )
-        
+
     def test_TryLink(self):
         """Test SConf.TryLink
         """
-        self._baseTryXXX( "TryLink" ) #self.SConf.SConf.TryLink ) 
+        self._baseTryXXX( "TryLink" ) #self.SConf.SConf.TryLink )
 
     def test_TryRun(self):
         """Test SConf.TryRun
@@ -256,10 +256,10 @@ int main() {
   return 0;
 }
 """
-            res1 = sconf.TryRun( prog, ".c" ) 
+            res1 = sconf.TryRun( prog, ".c" )
             res2 = sconf.TryRun( "not a c program\n", ".c" )
             return (res1, res2)
-        
+
         self._resetSConfState()
         sconf = self.SConf.SConf(self.scons_env,
                                  conf_dir=self.test.workpath('config.tests'),
@@ -307,7 +307,7 @@ int main() {
                                   log_file=self.test.workpath('config.log'))
         try:
             (ret, output) = sconf.TryAction(action=actionOK)
-            assert ret and output == bytearray("RUN OK"+os.linesep,'utf-8'), (ret, output)
+            assert ret and output.encode('utf-8') == bytearray("RUN OK"+os.linesep,'utf-8'), (ret, output)
             (ret, output) = sconf.TryAction(action=actionFAIL)
             assert not ret and output == "", (ret, output)
         finally:
@@ -354,7 +354,7 @@ int main() {
             try:
                 self._test_check_compilers('CC', sconf.CheckCC, 'CheckCC')
             except AssertionError:
-                sys.stderr.write(self.test.read('config.log'))
+                sys.stderr.write(self.test.read('config.log', mode='r'))
                 raise
         finally:
             sconf.Finish()
@@ -370,7 +370,7 @@ int main() {
             try:
                 self._test_check_compilers('SHCC', sconf.CheckSHCC, 'CheckSHCC')
             except AssertionError:
-                sys.stderr.write(self.test.read('config.log'))
+                sys.stderr.write(self.test.read('config.log', mode='r'))
                 raise
         finally:
             sconf.Finish()
@@ -386,7 +386,7 @@ int main() {
             try:
                 self._test_check_compilers('CXX', sconf.CheckCXX, 'CheckCXX')
             except AssertionError:
-                sys.stderr.write(self.test.read('config.log'))
+                sys.stderr.write(self.test.read('config.log', mode='r'))
                 raise
         finally:
             sconf.Finish()
@@ -402,7 +402,7 @@ int main() {
             try:
                 self._test_check_compilers('SHCXX', sconf.CheckSHCXX, 'CheckSHCXX')
             except AssertionError:
-                sys.stderr.write(self.test.read('config.log'))
+                sys.stderr.write(self.test.read('config.log', mode='r'))
                 raise
         finally:
             sconf.Finish()
@@ -627,8 +627,8 @@ int main() {
             else:
                 r = sconf.CheckProg('cmd.exe')
                 self.assertIn('cmd.exe',r)
-                
-                
+
+
             r = sconf.CheckProg('hopefully-not-a-program')
             assert r is None
 
@@ -717,7 +717,7 @@ int main() {
             # In ANSI C, malloc should be available in stdlib
             r = sconf.CheckDeclaration('malloc', includes = "#include <stdlib.h>")
             assert r, "malloc not declared ??"
-            # For C++, __cplusplus should be declared 
+            # For C++, __cplusplus should be declared
             r = sconf.CheckDeclaration('__cplusplus', language = 'C++')
             assert r, "__cplusplus not declared in C++ ??"
             r = sconf.CheckDeclaration('__cplusplus', language = 'C')
@@ -761,7 +761,7 @@ int main() {
             test.Result( ret )
             assert ret and output == "Hello", (ret, output)
             return ret
-        
+
 
         self._resetSConfState()
         sconf = self.SConf.SConf(self.scons_env,
@@ -773,7 +773,7 @@ int main() {
             assert ret, ret
         finally:
             sconf.Finish()
-            
+
 
 if __name__ == "__main__":
     suite = unittest.makeSuite(SConfTestCase, 'test_')