diff options
author | ptomulik <ptomulik@meil.pw.edu.pl> | 2014-04-09 15:34:17 +0200 |
---|---|---|
committer | ptomulik <ptomulik@meil.pw.edu.pl> | 2014-04-09 15:34:17 +0200 |
commit | a3f886c010a156e528a472a8f2e55ccac6679c9e (patch) | |
tree | ac11bb8fb4151a520cb6c4c14b41c97fd5238dc6 | |
parent | 2679673f989083a21951f2855143f5370b5b3b7d (diff) | |
download | scons-a3f886c010a156e528a472a8f2e55ccac6679c9e.tar.gz |
Fixed SConf.Streamer to work with non-unicode input on python 2.x
-rw-r--r-- | src/engine/SCons/SConf.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/engine/SCons/SConf.py b/src/engine/SCons/SConf.py index 7a8a0c21..068af3a2 100644 --- a/src/engine/SCons/SConf.py +++ b/src/engine/SCons/SConf.py @@ -180,7 +180,13 @@ class Streamer(object): def write(self, str): if self.orig: self.orig.write(str) - self.s.write(str) + try: + self.s.write(str) + except TypeError as e: + if e.message.startswith('unicode argument expected'): + self.s.write(str.decode()) + else: + raise def writelines(self, lines): for l in lines: |