Merge branch 'release/3.0.0-1'3.0.0-1

1 files changed, 8 insertions, 6 deletions

diff --git a/engine/SCons/Tool/swig.py b/engine/SCons/Tool/swig.py
index 0f6883c..dedf103 100644
--- a/engine/SCons/Tool/swig.py
+++ b/engine/SCons/Tool/swig.py
@@ -7,9 +7,10 @@ It will usually be imported through the generic SCons.Tool.Tool()
 selection method.
 
 """
+from __future__ import print_function
 
 #
-# Copyright (c) 2001 - 2016 The SCons Foundation
+# Copyright (c) 2001 - 2017 The SCons Foundation
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -31,7 +32,7 @@ selection method.
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
 
-__revision__ = "src/engine/SCons/Tool/swig.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog"
+__revision__ = "src/engine/SCons/Tool/swig.py rel_3.0.0:4395:8972f6a2f699 2017/09/18 12:59:24 bdbaddog"
 
 import os.path
 import re
@@ -140,13 +141,14 @@ def _get_swig_version(env, swig):
                                  stdout = subprocess.PIPE)
     if pipe.wait() != 0: return
 
-    out = pipe.stdout.read()
-    match = re.search(r'SWIG Version\s+(\S+).*', out, re.MULTILINE)
+    # MAYBE:   out = SCons.Util.to_str (pipe.stdout.read())
+    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)
+        if verbose: print("Version is:%s"%match.group(1))
         return match.group(1)
     else:
-        if verbose: print "Unable to detect version: [%s]"%out
+        if verbose: print("Unable to detect version: [%s]"%out)
 
 def generate(env):
     """Add Builders and construction variables for swig to an Environment."""