diff options
| author | Gaurav Juvekar <gauravjuvekar@gmail.com> | 2017-04-16 14:16:47 (GMT) |
|---|---|---|
| committer | Gaurav Juvekar <gauravjuvekar@gmail.com> | 2017-04-16 14:16:47 (GMT) |
| commit | 9ced8fe7b4e2f878df32ab3f606f851ac4cb6efc (patch) | |
| tree | 401d985210b029903ee323e208f598f9d9d22db3 /src/engine/SCons/Node | |
| parent | 62bdd33553c4df9e658855b5bfb32e9f1d4ec6a5 (diff) | |
| download | SCons-9ced8fe7b4e2f878df32ab3f606f851ac4cb6efc.zip SCons-9ced8fe7b4e2f878df32ab3f606f851ac4cb6efc.tar.gz SCons-9ced8fe7b4e2f878df32ab3f606f851ac4cb6efc.tar.bz2 | |
Try to fix some more py2/3 tests becuase of str vs bytearray
Diffstat (limited to 'src/engine/SCons/Node')
| -rw-r--r-- | src/engine/SCons/Node/Python.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/engine/SCons/Node/Python.py b/src/engine/SCons/Node/Python.py index 2a3ce98..8c47c97 100644 --- a/src/engine/SCons/Node/Python.py +++ b/src/engine/SCons/Node/Python.py @@ -137,7 +137,13 @@ class Value(SCons.Node.Node): return contents def get_contents(self): - return self.get_text_contents().encode() + text_contents = self.get_text_contents() + try: + return text_contents.encode() + except UnicodeDecodeError: + # Already encoded as python2 str are bytes + return text_contents + def changed_since_last_build(self, target, prev_ni): cur_csig = self.get_csig() |