diff options
| author | Steven Knight <knight@baldmt.com> | 2004-10-23 17:50:16 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2004-10-23 17:50:16 (GMT) |
| commit | 8fc56d4098128552043f581cb50074426a149959 (patch) | |
| tree | dc5de415bf5a9f270274885304e179920e8df90a | |
| parent | 01018a94b70c997110057fe752d7135489a28f39 (diff) | |
| download | SCons-8fc56d4098128552043f581cb50074426a149959.zip SCons-8fc56d4098128552043f581cb50074426a149959.tar.gz SCons-8fc56d4098128552043f581cb50074426a149959.tar.bz2 | |
Fix ExecutorTests under Python 2.x, where str() throws a TypeError if the returned value is not a string.
| -rw-r--r-- | src/engine/SCons/Executor.py | 2 | ||||
| -rw-r--r-- | src/engine/SCons/ExecutorTests.py | 2 |
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 |