Result of raw 2to3 run (2to3-2.7); checkpoint for python3 conversion.

7 files changed, 13 insertions, 10 deletions

diff --git a/src/engine/SCons/Scanner/C.py b/src/engine/SCons/Scanner/C.py
index 3311a09..74b01a4 100644
--- a/src/engine/SCons/Scanner/C.py
+++ b/src/engine/SCons/Scanner/C.py
@@ -59,7 +59,7 @@ class SConsCPPScanner(SCons.cpp.PreProcessor):
     def read_file(self, file):
         try:
             fp = open(str(file.rfile()))
-        except EnvironmentError, e:
+        except EnvironmentError as e:
             self.missing.append((file, self.current_file))
             return ''
         else:
diff --git a/src/engine/SCons/Scanner/Fortran.py b/src/engine/SCons/Scanner/Fortran.py
index 1b55130..5339ab2 100644
--- a/src/engine/SCons/Scanner/Fortran.py
+++ b/src/engine/SCons/Scanner/Fortran.py
@@ -35,6 +35,7 @@ import SCons.Node.FS
 import SCons.Scanner
 import SCons.Util
 import SCons.Warnings
+import collections
 
 class F90Scanner(SCons.Scanner.Classic):
     """
@@ -109,7 +110,7 @@ class F90Scanner(SCons.Scanner.Classic):
         # is actually found in a Repository or locally.
         nodes = []
         source_dir = node.get_dir()
-        if callable(path):
+        if isinstance(path, collections.Callable):
             path = path()
         for dep in mods_and_includes:
             n, i = self.find_include(dep, source_dir, path)
diff --git a/src/engine/SCons/Scanner/LaTeX.py b/src/engine/SCons/Scanner/LaTeX.py
index 2cb1ed5..1e0fea1 100644
--- a/src/engine/SCons/Scanner/LaTeX.py
+++ b/src/engine/SCons/Scanner/LaTeX.py
@@ -200,14 +200,14 @@ class LaTeX(SCons.Scanner.Base):
             """
             def __init__(self, dictionary):
                 self.dictionary = {}
-                for k,n in dictionary.items():
+                for k,n in list(dictionary.items()):
                     self.dictionary[k] = ( SCons.Scanner.FindPathDirs(n),
                                            FindENVPathDirs(n) )
 
             def __call__(self, env, dir=None, target=None, source=None,
                                     argument=None):
                 di = {}
-                for k,(c,cENV)  in self.dictionary.items():
+                for k,(c,cENV)  in list(self.dictionary.items()):
                     di[k] = ( c(env, dir=None, target=None, source=None,
                                    argument=None) ,
                               cENV(env, dir=None, target=None, source=None,
diff --git a/src/engine/SCons/Scanner/Prog.py b/src/engine/SCons/Scanner/Prog.py
index 49e93a5..6e2da21 100644
--- a/src/engine/SCons/Scanner/Prog.py
+++ b/src/engine/SCons/Scanner/Prog.py
@@ -27,6 +27,7 @@ import SCons.Node
 import SCons.Node.FS
 import SCons.Scanner
 import SCons.Util
+import collections
 
 # global, set by --debug=findlibs
 print_find_libs = None
@@ -76,7 +77,7 @@ def scan(node, env, libpath = ()):
 
     result = []
 
-    if callable(libpath):
+    if isinstance(libpath, collections.Callable):
         libpath = libpath()
 
     find_file = SCons.Node.FS.find_file
diff --git a/src/engine/SCons/Scanner/ProgTests.py b/src/engine/SCons/Scanner/ProgTests.py
index 411e035..f564c91 100644
--- a/src/engine/SCons/Scanner/ProgTests.py
+++ b/src/engine/SCons/Scanner/ProgTests.py
@@ -230,7 +230,7 @@ def suite():
     suite.addTest(ProgramScannerTestCase6())
     suite.addTest(ProgramScannerTestCase7())
     suite.addTest(ProgramScannerTestCase8())
-    try: unicode
+    try: str
     except NameError: pass
     else:
         code = """if 1:
@@ -245,7 +245,7 @@ def suite():
                     assert deps_match(deps, ['d1/l2.lib', 'd1/d2/l3.lib']), map(str, deps)
             suite.addTest(ProgramScannerTestCase4())
             \n"""
-        exec code
+        exec(code)
     return suite
 
 if __name__ == "__main__":
diff --git a/src/engine/SCons/Scanner/ScannerTests.py b/src/engine/SCons/Scanner/ScannerTests.py
index ee26922..5a4639d 100644
--- a/src/engine/SCons/Scanner/ScannerTests.py
+++ b/src/engine/SCons/Scanner/ScannerTests.py
@@ -569,7 +569,7 @@ class ClassicCPPTestCase(unittest.TestCase):
             assert n == 'path/bbb', n
             assert i == 'bbb', i
 
-            n, i = s.find_include(('<', u'ccc'), 'foo', ('path',))
+            n, i = s.find_include(('<', 'ccc'), 'foo', ('path',))
             assert n == 'path/ccc', n
             assert i == 'ccc', i
 
diff --git a/src/engine/SCons/Scanner/__init__.py b/src/engine/SCons/Scanner/__init__.py
index 562a361..6ec8df9 100644
--- a/src/engine/SCons/Scanner/__init__.py
+++ b/src/engine/SCons/Scanner/__init__.py
@@ -33,6 +33,7 @@ import re
 
 import SCons.Node.FS
 import SCons.Util
+import collections
 
 
 class _Null(object):
@@ -178,7 +179,7 @@ class Base(object):
         self.node_class = node_class
         self.node_factory = node_factory
         self.scan_check = scan_check
-        if callable(recursive):
+        if isinstance(recursive, collections.Callable):
             self.recurse_nodes = recursive
         elif recursive:
             self.recurse_nodes = self._recurse_all_nodes
@@ -369,7 +370,7 @@ class Classic(Current):
         # is actually found in a Repository or locally.
         nodes = []
         source_dir = node.get_dir()
-        if callable(path):
+        if isinstance(path, collections.Callable):
             path = path()
         for include in includes:
             n, i = self.find_include(include, source_dir, path)