Fixed SConf.Streamer to work with non-unicode input on python 2.x

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: