diff options
author | William Deegan <bill@baddogconsulting.com> | 2017-03-19 20:05:26 (GMT) |
---|---|---|
committer | William Deegan <bill@baddogconsulting.com> | 2017-03-19 20:05:26 (GMT) |
commit | 415927988528083c1c5e719996e4f58684dc1301 (patch) | |
tree | b3ded4003be8bd00d29e1928d59cb0c70c326202 | |
parent | 46fd61694e79ec07c9317f62914bd90dbc7fe5c6 (diff) | |
download | SCons-415927988528083c1c5e719996e4f58684dc1301.zip SCons-415927988528083c1c5e719996e4f58684dc1301.tar.gz SCons-415927988528083c1c5e719996e4f58684dc1301.tar.bz2 |
py2/3 convert output from running swig to get version string to string. On py3 it was binary yielding all outputs of SWIGVERSION to be b'actual version'
-rw-r--r-- | src/engine/SCons/Tool/swig.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/engine/SCons/Tool/swig.py b/src/engine/SCons/Tool/swig.py index 9935de8..da4472f 100644 --- a/src/engine/SCons/Tool/swig.py +++ b/src/engine/SCons/Tool/swig.py @@ -142,8 +142,8 @@ def _get_swig_version(env, swig): if pipe.wait() != 0: return # MAYBE: out = SCons.Util.to_str (pipe.stdout.read()) - out = pipe.stdout.read() - match = re.search(b'SWIG Version\s+(\S+).*', out, re.MULTILINE) + out = SCons.Util.to_str(pipe.stdout.read()) + match = re.search('SWIG Version\s+(\S+).*', out, re.MULTILINE) if match: if verbose: print("Version is:%s"%match.group(1)) return match.group(1) |