summaryrefslogtreecommitdiffstats
path: root/src/engine
diff options
context:
space:
mode:
authorSteven Knight <knight@baldmt.com>2004-10-23 17:50:16 (GMT)
committerSteven Knight <knight@baldmt.com>2004-10-23 17:50:16 (GMT)
commit8692d2877a895a92c1242abbdcb69fbf13eea346 (patch)
treedc5de415bf5a9f270274885304e179920e8df90a /src/engine
parent315181a1e7f5195346448f97a136fe826fd2e970 (diff)
downloadSCons-8692d2877a895a92c1242abbdcb69fbf13eea346.zip
SCons-8692d2877a895a92c1242abbdcb69fbf13eea346.tar.gz
SCons-8692d2877a895a92c1242abbdcb69fbf13eea346.tar.bz2
Fix ExecutorTests under Python 2.x, where str() throws a TypeError if the returned value is not a string.
Diffstat (limited to 'src/engine')
-rw-r--r--src/engine/SCons/Executor.py2
-rw-r--r--src/engine/SCons/ExecutorTests.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/engine/SCons/Executor.py b/src/engine/SCons/Executor.py
index 6767cc8..68af6ed 100644
--- 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 d52853c..dc98818 100644
--- 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