diff options
| author | Gary Oberbrunner <garyo@oberbrunner.com> | 2013-09-22 17:10:51 (GMT) |
|---|---|---|
| committer | Gary Oberbrunner <garyo@oberbrunner.com> | 2013-09-22 17:10:51 (GMT) |
| commit | b554eb817c60f4e419bbc84efc02c7fbc62b7ced (patch) | |
| tree | 5d6a8f035bcce302da428d3dd9d26920407a78ee /src/engine/SCons/Executor.py | |
| parent | 953dc41b8b720fdcec7955de67d23206214e5125 (diff) | |
| download | SCons-b554eb817c60f4e419bbc84efc02c7fbc62b7ced.zip SCons-b554eb817c60f4e419bbc84efc02c7fbc62b7ced.tar.gz SCons-b554eb817c60f4e419bbc84efc02c7fbc62b7ced.tar.bz2 | |
Manual python3 post-2to3 fixes from Neal Becker
Diffstat (limited to 'src/engine/SCons/Executor.py')
| -rw-r--r-- | src/engine/SCons/Executor.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/engine/SCons/Executor.py b/src/engine/SCons/Executor.py index 6f2489b..68419b8 100644 --- a/src/engine/SCons/Executor.py +++ b/src/engine/SCons/Executor.py @@ -427,7 +427,7 @@ class Executor(object): except KeyError: pass env = self.get_build_env() - result = "".join([action.get_contents(self.get_all_targets(), + result = b"".join([action.get_contents(self.get_all_targets(), self.get_all_sources(), env) for action in self.get_action_list()]) |