summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorWilliam Deegan <bill@baddogconsulting.com>2017-02-21 04:05:40 (GMT)
committerWilliam Deegan <bill@baddogconsulting.com>2017-02-21 04:05:40 (GMT)
commit567f5aa089a1ad664df268cdb128e8c92808522d (patch)
tree215ad4a3047333c203ebf4b4d07e5d36394f55c0 /src
parentd68c584feb4a01fa5b511701996d3833968ccae1 (diff)
downloadSCons-567f5aa089a1ad664df268cdb128e8c92808522d.zip
SCons-567f5aa089a1ad664df268cdb128e8c92808522d.tar.gz
SCons-567f5aa089a1ad664df268cdb128e8c92808522d.tar.bz2
fix string/bytearray issue for py2/3 port
Diffstat (limited to 'src')
-rw-r--r--src/engine/SCons/Executor.py11
1 files changed, 9 insertions, 2 deletions
diff --git a/src/engine/SCons/Executor.py b/src/engine/SCons/Executor.py
index dd5088d..aadca01 100644
--- a/src/engine/SCons/Executor.py
+++ b/src/engine/SCons/Executor.py
@@ -26,6 +26,7 @@ Nodes.
# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+from __future__ import print_function
__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
@@ -455,10 +456,16 @@ class Executor(object, with_metaclass(NoSlotsPyPy)):
except KeyError:
pass
env = self.get_build_env()
- result = b"".join([action.get_contents(self.get_all_targets(),
+ sga = self.get_action_list()
+ sga_contents = [action.get_contents(self.get_all_targets(),
self.get_all_sources(),
env)
- for action in self.get_action_list()])
+ for action in self.get_action_list()]
+
+ result = bytearray()
+ for a in sga_contents:
+ result.extend(a)
+
self._memo['get_contents'] = result
return result