diff options
Diffstat (limited to 'SCons/Tool/textfile.py')
| -rw-r--r-- | SCons/Tool/textfile.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/SCons/Tool/textfile.py b/SCons/Tool/textfile.py index bb8a0f9..c1b597f 100644 --- a/SCons/Tool/textfile.py +++ b/SCons/Tool/textfile.py @@ -48,8 +48,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" import SCons -import os -import re from SCons.Node import Node from SCons.Node.Python import Value @@ -76,8 +74,8 @@ def _do_subst(node, subs): if 'b' in TEXTFILE_FILE_WRITE_MODE: try: contents = bytearray(contents, 'utf-8') - except UnicodeDecodeError: - # contents is already utf-8 encoded python 2 str i.e. a byte array + except TypeError: + # TODO: this should not happen, get_text_contents returns text contents = bytearray(contents) return contents |