From 2fd80b075a4a8ddd9b18fff92ccc608db34db0d9 Mon Sep 17 00:00:00 2001 From: ptomulik Date: Wed, 9 Apr 2014 15:34:17 +0200 Subject: Fixed SConf.Streamer to work with non-unicode input on python 2.x --- src/engine/SCons/SConf.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) 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: -- cgit v0.12