summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWilliam Deegan <bill@baddogconsulting.com>2017-03-13 19:55:14 (GMT)
committerWilliam Deegan <bill@baddogconsulting.com>2017-03-13 19:55:14 (GMT)
commit884bb12d7f4e3dc70e16ca9edfa807c4179bb9bb (patch)
tree6b0f837fdebab4dd9a7c1d6a4998427d3dffeb13
parentb3520594afe39b38e4b2a380f97798f0d663e37e (diff)
downloadSCons-884bb12d7f4e3dc70e16ca9edfa807c4179bb9bb.zip
SCons-884bb12d7f4e3dc70e16ca9edfa807c4179bb9bb.tar.gz
SCons-884bb12d7f4e3dc70e16ca9edfa807c4179bb9bb.tar.bz2
output from try run comes from get_content() which is bytes. So use SCons.Util.to_str to convert to string on py3
-rw-r--r--src/engine/SCons/SConf.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/engine/SCons/SConf.py b/src/engine/SCons/SConf.py
index c68d1c6..31d9402 100644
--- a/src/engine/SCons/SConf.py
+++ b/src/engine/SCons/SConf.py
@@ -643,7 +643,7 @@ class SConfBase(object):
node = self.env.Command(output, prog, [ [ pname, ">", "${TARGET}"] ])
ok = self.BuildNodes(node)
if ok:
- outputStr = output.get_contents()
+ outputStr = SCons.Util.to_str(output.get_contents())
return( 1, outputStr)
return (0, "")