Merge tag 'upstream/2.3.5'

Upstream version 2.3.5

1 files changed, 4 insertions, 6 deletions

diff --git a/src/engine/SCons/SConf.py b/src/engine/SCons/SConf.py
index 476bc20..170a616 100644
--- a/src/engine/SCons/SConf.py
+++ b/src/engine/SCons/SConf.py
@@ -12,7 +12,7 @@ libraries are installed, if some command line options are supported etc.
 """
 
 #
-# Copyright (c) 2001 - 2014 The SCons Foundation
+# Copyright (c) 2001 - 2015 The SCons Foundation
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -34,7 +34,7 @@ libraries are installed, if some command line options are supported etc.
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
 
-__revision__ = "src/engine/SCons/SConf.py  2014/09/27 12:51:43 garyo"
+__revision__ = "src/engine/SCons/SConf.py pchdll:3325:cd517fae59a4 2015/06/18 06:53:27 bdbaddog"
 
 import SCons.compat
 
@@ -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: