From 1a05853801eee7dab9dc005cd3c525cccc9b027a Mon Sep 17 00:00:00 2001 From: William Deegan Date: Sun, 26 Feb 2017 12:50:22 -0800 Subject: fix for py2/3 compat --- src/engine/SCons/Action.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/engine/SCons/Action.py b/src/engine/SCons/Action.py index ceda168..eb215fd 100644 --- a/src/engine/SCons/Action.py +++ b/src/engine/SCons/Action.py @@ -477,7 +477,7 @@ class ActionBase(object): result = self.get_presig(target, source, env) if not isinstance(result,(bytes, bytearray)): - result = bytearray("").join([ SCons.Util.to_bytes(r) for r in result ]) + result = bytearray("",'utf-8').join([ SCons.Util.to_bytes(r) for r in result ]) else: # Make a copy and put in bytearray, without this the contents returned by get_presig # can be changed by the logic below, appending with each call and causing very -- cgit v0.12