Fix ExecutorTests under Python 2.x, where str() throws a TypeError if the returned...

git-svn-id: http://scons.tigris.org/svn/scons/trunk@1139 fdb21ef1-2011-0410-befe-b5e4ea1792b1

diff --git a/src/engine/SCons/Executor.py b/src/engine/SCons/Executor.py
index 6767cc874693f002d1a5567fe443ecaa78696a37..68af6ed6f8d1271bfa31c5583025a690da9b40c4 100644 (file)
--- a/src/engine/SCons/Executor.py
+++ b/src/engine/SCons/Executor.py
@@ -164,7 +164,7 @@ class Executor:
 
     def nullify(self):
         self.__call__ = self.do_nothing
-        self.string = None
+        self.string = ''
         self._strfunc = None
 
     def get_raw_contents(self):

diff --git a/src/engine/SCons/ExecutorTests.py b/src/engine/SCons/ExecutorTests.py
index d52853c903e96fcf01002a16488ab9fb1cd2b167..dc98818d3bf43d8e8344a9c2fb62772c4ed086e1 100644 (file)
--- a/src/engine/SCons/ExecutorTests.py
+++ b/src/engine/SCons/ExecutorTests.py
@@ -237,7 +237,7 @@ class ExecutorTestCase(unittest.TestCase):
         x(MyNode([], []), None)
         assert result == [], result
         s = str(x)
-        assert s == None, s
+        assert s == '', s
         s = x.strfunction()
         assert s == None, s