From 7d4031dca4d8c9f73e59c8c0bcb165eb2f6248ba Mon Sep 17 00:00:00 2001 From: William Deegan Date: Thu, 19 Feb 2015 13:31:04 -0800 Subject: Fix issue found by test/Configure/Streamer1.py failing on win32 per discussion with Pawel Tomulik. Any typeerror will be handled by trying str.decode() --- src/engine/SCons/SConf.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/engine/SCons/SConf.py b/src/engine/SCons/SConf.py index d6a70ec..87432ef 100644 --- a/src/engine/SCons/SConf.py +++ b/src/engine/SCons/SConf.py @@ -197,10 +197,8 @@ class Streamer(object): try: self.s.write(str) except TypeError as e: - if e.message.startswith('unicode argument expected'): - self.s.write(str.decode()) - else: - raise + # "unicode argument expected" bug in IOStream (python 2.x) + self.s.write(str.decode()) def writelines(self, lines): for l in lines: -- cgit v0.12