diff options
| author | William Deegan <bill@baddogconsulting.com> | 2017-02-26 20:50:22 (GMT) |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2017-02-26 20:50:22 (GMT) |
| commit | 1a05853801eee7dab9dc005cd3c525cccc9b027a (patch) | |
| tree | 7f2788ee6c0e292404d97804f8d55fc9cdbe64f5 /src/engine/SCons/Action.py | |
| parent | 0b1f425c3336551ed3f100ac3894c61d294afff6 (diff) | |
| download | SCons-1a05853801eee7dab9dc005cd3c525cccc9b027a.zip SCons-1a05853801eee7dab9dc005cd3c525cccc9b027a.tar.gz SCons-1a05853801eee7dab9dc005cd3c525cccc9b027a.tar.bz2 | |
fix for py2/3 compat
Diffstat (limited to 'src/engine/SCons/Action.py')
| -rw-r--r-- | src/engine/SCons/Action.py | 2 |
1 files changed, 1 insertions, 1 deletions
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 |