Manual python3 post-2to3 fixes from Neal Becker

6 files changed, 11 insertions, 9 deletions

diff --git a/src/engine/SCons/Tool/__init__.py b/src/engine/SCons/Tool/__init__.py
index ac180a9..1d5b504 100644
--- a/src/engine/SCons/Tool/__init__.py
+++ b/src/engine/SCons/Tool/__init__.py
@@ -114,7 +114,7 @@ class Tool(object):
                     if file:
                         file.close()
             except ImportError as e:
-                if str(e)!="No module named %s"%self.name:
+                if not str(e).startswith ("No module"):
                     raise SCons.Errors.EnvironmentError(e)
                 try:
                     import zipimport
@@ -144,7 +144,7 @@ class Tool(object):
                         file.close()
                     return module
                 except ImportError as e:
-                    if str(e)!="No module named %s"%self.name:
+                    if not str(e).startswith("No module"):
                         raise SCons.Errors.EnvironmentError(e)
                     try:
                         import zipimport
diff --git a/src/engine/SCons/Tool/g++.py b/src/engine/SCons/Tool/g++.py
index e4da5fe..0e1c181 100644
--- a/src/engine/SCons/Tool/g++.py
+++ b/src/engine/SCons/Tool/g++.py
@@ -40,8 +40,7 @@ import subprocess
 import SCons.Tool
 import SCons.Util
 
-cplusplus = __import__('c++', globals(), locals(), [])
-
+cplusplus = __import__(__package__+'.c++', globals(), locals(), ['*'])
 compilers = ['g++']
 
 def generate(env):
@@ -75,7 +74,7 @@ def generate(env):
         #line = pipe.stdout.read().strip()
         #if line:
         #    env['CXXVERSION'] = line
-        line = pipe.stdout.readline()
+        line = SCons.Util.to_str (pipe.stdout.readline())
         match = re.search(r'[0-9]+(\.[0-9]+)+', line)
         if match:
             env['CXXVERSION'] = match.group(0)
diff --git a/src/engine/SCons/Tool/gas.py b/src/engine/SCons/Tool/gas.py
index 28f84db..d01bd60 100644
--- a/src/engine/SCons/Tool/gas.py
+++ b/src/engine/SCons/Tool/gas.py
@@ -33,7 +33,10 @@ selection method.
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-as_module = __import__('as', globals(), locals(), [])
+try:
+    as_module = __import__('as', globals(), locals(), [])
+except:
+    as_module = __import__(__package__+'.as', globals(), locals(), ['*'])
 
 assemblers = ['as', 'gas']
 
diff --git a/src/engine/SCons/Tool/gcc.py b/src/engine/SCons/Tool/gcc.py
index 4f87b24..72f9bfd 100644
--- a/src/engine/SCons/Tool/gcc.py
+++ b/src/engine/SCons/Tool/gcc.py
@@ -65,7 +65,7 @@ def generate(env):
         #line = pipe.stdout.read().strip()
         #if line:
         #    env['CCVERSION'] = line
-        line = pipe.stdout.readline()
+        line = SCons.Util.to_str (pipe.stdout.readline())
         match = re.search(r'[0-9]+(\.[0-9]+)+', line)
         if match:
             env['CCVERSION'] = match.group(0)
diff --git a/src/engine/SCons/Tool/link.py b/src/engine/SCons/Tool/link.py
index 5539f62..864a018 100644
--- a/src/engine/SCons/Tool/link.py
+++ b/src/engine/SCons/Tool/link.py
@@ -42,7 +42,7 @@ import SCons.Warnings
 
 from SCons.Tool.FortranCommon import isfortran
 
-cplusplus = __import__('c++', globals(), locals(), [])
+cplusplus = __import__(__package__+'.c++', globals(), locals(), ['*'])
 
 issued_mixed_link_warning = False
 
diff --git a/src/engine/SCons/Tool/swig.py b/src/engine/SCons/Tool/swig.py
index d51a386..5d2264c 100644
--- a/src/engine/SCons/Tool/swig.py
+++ b/src/engine/SCons/Tool/swig.py
@@ -131,7 +131,7 @@ def _get_swig_version(env):
                                  stdout = subprocess.PIPE)
     if pipe.wait() != 0: return
 
-    out = pipe.stdout.read()
+    out = SCons.Util.to_str (pipe.stdout.read())
     match = re.search(r'SWIG Version\s+(\S+)$', out, re.MULTILINE)
     if match:
         return match.group(1)