diff options
| author | William Deegan <bill@baddogconsulting.com> | 2015-02-19 21:31:04 (GMT) |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2015-02-19 21:31:04 (GMT) |
| commit | 7d4031dca4d8c9f73e59c8c0bcb165eb2f6248ba (patch) | |
| tree | 7def865fc4d4c85aeb53e2278933355044362b5a | |
| parent | 88f988450292677f7c4b0de084585f1d561d8591 (diff) | |
| download | SCons-7d4031dca4d8c9f73e59c8c0bcb165eb2f6248ba.zip SCons-7d4031dca4d8c9f73e59c8c0bcb165eb2f6248ba.tar.gz SCons-7d4031dca4d8c9f73e59c8c0bcb165eb2f6248ba.tar.bz2 | |
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()
| -rw-r--r-- | src/engine/SCons/SConf.py | 6 |
1 files 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: |