diff options
| author | ptomulik <ptomulik@meil.pw.edu.pl> | 2014-04-09 13:34:17 (GMT) |
|---|---|---|
| committer | ptomulik <ptomulik@meil.pw.edu.pl> | 2014-04-09 13:34:17 (GMT) |
| commit | 2fd80b075a4a8ddd9b18fff92ccc608db34db0d9 (patch) | |
| tree | ac11bb8fb4151a520cb6c4c14b41c97fd5238dc6 /src/engine/SCons | |
| parent | 0ee2bd1435b955c1ffd1962ecb8ae32a4529171e (diff) | |
| download | SCons-2fd80b075a4a8ddd9b18fff92ccc608db34db0d9.zip SCons-2fd80b075a4a8ddd9b18fff92ccc608db34db0d9.tar.gz SCons-2fd80b075a4a8ddd9b18fff92ccc608db34db0d9.tar.bz2 | |
Fixed SConf.Streamer to work with non-unicode input on python 2.x
Diffstat (limited to 'src/engine/SCons')
| -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 7a8a0c2..068af3a 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: |