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

3 files changed, 35 insertions, 34 deletions

diff --git a/src/engine/SCons/Node/FS.py b/src/engine/SCons/Node/FS.py
index f31ca83..22dca1f 100644
--- a/src/engine/SCons/Node/FS.py
+++ b/src/engine/SCons/Node/FS.py
@@ -54,6 +54,7 @@ import SCons.Util
 import SCons.Warnings
 
 from SCons.Debug import Trace
+import collections
 
 do_store_info = True
 print_duplicate = 0
@@ -550,7 +551,7 @@ class EntryProxy(SCons.Util.Proxy):
         except KeyError:
             try:
                 attr = SCons.Util.Proxy.__getattr__(self, name)
-            except AttributeError, e:
+            except AttributeError as e:
                 # Raise our own AttributeError subclass with an
                 # overridden __str__() method that identifies the
                 # name of the entry that caused the exception.
@@ -1508,7 +1509,7 @@ class Dir(Base):
         This clears any cached information that is invalidated by changing
         the repository."""
 
-        for node in self.entries.values():
+        for node in list(self.entries.values()):
             if node != self.dir:
                 if node != self and isinstance(node, Dir):
                     node.__clearRepositoryCache(duplicate)
@@ -2055,7 +2056,7 @@ class Dir(Base):
             # We use the .name attribute from the Node because the keys of
             # the dir.entries dictionary are normalized (that is, all upper
             # case) on case-insensitive systems like Windows.
-            node_names = [ v.name for k, v in dir.entries.items()
+            node_names = [ v.name for k, v in list(dir.entries.items())
                            if k not in ('.', '..') ]
             names.extend(node_names)
             if not strings:
@@ -2420,7 +2421,7 @@ class File(Base):
         fname = self.rfile().abspath
         try:
             contents = open(fname, "rb").read()
-        except EnvironmentError, e:
+        except EnvironmentError as e:
             if not e.filename:
                 e.filename = fname
             raise
@@ -2455,7 +2456,7 @@ class File(Base):
         try:
             cs = SCons.Util.MD5filesignature(fname,
                 chunksize=SCons.Node.FS.File.md5_chunksize*1024)
-        except EnvironmentError, e:
+        except EnvironmentError as e:
             if not e.filename:
                 e.filename = fname
             raise
@@ -2793,7 +2794,7 @@ class File(Base):
     def _rmv_existing(self):
         self.clear_memoized_values()
         if print_duplicate:
-            print "dup: removing existing target %s"%self
+            print("dup: removing existing target %s"%self)
         e = Unlink(self, [], None)
         if isinstance(e, SCons.Errors.BuildError):
             raise e
@@ -2817,7 +2818,7 @@ class File(Base):
             else:
                 try:
                     self._createDir()
-                except SCons.Errors.StopError, drive:
+                except SCons.Errors.StopError as drive:
                     desc = "No drive `%s' for target `%s'." % (drive, self)
                     raise SCons.Errors.StopError(desc)
 
@@ -2835,7 +2836,7 @@ class File(Base):
     def do_duplicate(self, src):
         self._createDir()
         if print_duplicate:
-            print "dup: relinking variant '%s' from '%s'"%(self, src)
+            print("dup: relinking variant '%s' from '%s'"%(self, src))
         Unlink(self, None, None)
         e = Link(self, src, None)
         if isinstance(e, SCons.Errors.BuildError):
@@ -2870,7 +2871,7 @@ class File(Base):
                         # The source file does not exist.  Make sure no old
                         # copy remains in the variant directory.
                         if print_duplicate:
-                            print "dup: no src for %s, unlinking old variant copy"%self
+                            print("dup: no src for %s, unlinking old variant copy"%self)
                         if Base.exists(self) or self.islink():
                             self.fs.unlink(self.path)
                         # Return None explicitly because the Base.exists() call
@@ -3196,10 +3197,10 @@ class FileFinder(object):
             except KeyError:
                 pass
 
-        if verbose and not callable(verbose):
+        if verbose and not isinstance(verbose, collections.Callable):
             if not SCons.Util.is_String(verbose):
                 verbose = "find_file"
-            _verbose = u'  %s: ' % verbose
+            _verbose = '  %s: ' % verbose
             verbose = lambda s: sys.stdout.write(_verbose + s)
 
         filedir, filename = os.path.split(filename)
diff --git a/src/engine/SCons/Node/FSTests.py b/src/engine/SCons/Node/FSTests.py
index a60b8a4..e8442e9 100644
--- a/src/engine/SCons/Node/FSTests.py
+++ b/src/engine/SCons/Node/FSTests.py
@@ -20,7 +20,7 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
-from __future__ import division
+
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
@@ -567,13 +567,13 @@ class VariantDirTestCase(unittest.TestCase):
             dp = dnode.srcnode().path
             expect = os.path.normpath(srcnode_map.get(dir, dir))
             if dp != expect:
-                print "Dir `%s' srcnode() `%s' != expected `%s'" % (dir, dp, expect)
+                print("Dir `%s' srcnode() `%s' != expected `%s'" % (dir, dp, expect))
                 errors = errors + 1
 
             fp = fnode.srcnode().path
             expect = os.path.normpath(srcnode_map.get(f, f))
             if fp != expect:
-                print "File `%s' srcnode() `%s' != expected `%s'" % (f, fp, expect)
+                print("File `%s' srcnode() `%s' != expected `%s'" % (f, fp, expect))
                 errors = errors + 1
 
         for dir in dir_list:
@@ -585,14 +585,14 @@ class VariantDirTestCase(unittest.TestCase):
             tp = t[0].path
             expect = os.path.normpath(alter_map.get(dir, dir))
             if tp != expect:
-                print "Dir `%s' alter_targets() `%s' != expected `%s'" % (dir, tp, expect)
+                print("Dir `%s' alter_targets() `%s' != expected `%s'" % (dir, tp, expect))
                 errors = errors + 1
 
             t, m = fnode.alter_targets()
             tp = t[0].path
             expect = os.path.normpath(alter_map.get(f, f))
             if tp != expect:
-                print "File `%s' alter_targets() `%s' != expected `%s'" % (f, tp, expect)
+                print("File `%s' alter_targets() `%s' != expected `%s'" % (f, tp, expect))
                 errors = errors + 1
 
         self.failIf(errors)
@@ -1088,7 +1088,7 @@ class FSTestCase(_tempdirTestCase):
 
             try:
                 f2 = fs.File(sep.join(['f1', 'f2']), directory = d1)
-            except TypeError, x:
+            except TypeError as x:
                 assert str(x) == ("Tried to lookup File '%s' as a Dir." %
                                   d1_f1), x
             except:
@@ -1096,7 +1096,7 @@ class FSTestCase(_tempdirTestCase):
 
             try:
                 dir = fs.Dir(sep.join(['d1', 'f1']))
-            except TypeError, x:
+            except TypeError as x:
                 assert str(x) == ("Tried to lookup File '%s' as a Dir." %
                                   d1_f1), x
             except:
@@ -1104,7 +1104,7 @@ class FSTestCase(_tempdirTestCase):
 
             try:
                 f2 = fs.File('d1')
-            except TypeError, x:
+            except TypeError as x:
                 assert str(x) == ("Tried to lookup Dir '%s' as a File." %
                                   'd1'), x
             except:
@@ -1305,7 +1305,7 @@ class FSTestCase(_tempdirTestCase):
         assert f1.get_contents() == "Foo\x1aBar", f1.get_contents()
 
         # This tests to make sure we can decode UTF-8 text files.
-        test_string = u"Foo\x1aBar"
+        test_string = "Foo\x1aBar"
         test.write("utf8_file", test_string.encode('utf-8'))
         f1 = fs.File(test.workpath("utf8_file"))
         assert eval('f1.get_text_contents() == u"Foo\x1aBar"'), \
@@ -1645,7 +1645,7 @@ class FSTestCase(_tempdirTestCase):
 
         def unc_workpath(dirs, test=test):
             import ntpath
-            x = apply(test.workpath, dirs)
+            x = test.workpath(*dirs)
             drive, path = ntpath.splitdrive(x)
             unc, path = ntpath.splitunc(path)
             path = strip_slash(path)
@@ -1911,9 +1911,9 @@ class FSTestCase(_tempdirTestCase):
             del cases[:3]
             result = dir.rel_path(other)
             if result != expect:
-                if failed == 0: print
+                if failed == 0: print()
                 fmt = "    dir_path(%(dir)s, %(other)s) => '%(result)s' did not match '%(expect)s'"
-                print fmt % locals()
+                print(fmt % locals())
                 failed = failed + 1
         assert failed == 0, "%d rel_path() cases failed" % failed
 
@@ -2520,9 +2520,9 @@ class GlobTestCase(_tempdirTestCase):
                 fmt = lambda n: n
             if r != result:
                 import pprint
-                print "Glob(%s) expected:" % repr(input)
+                print("Glob(%s) expected:" % repr(input))
                 pprint.pprint(list(map(fmt, result)))
-                print "Glob(%s) got:" % repr(input)
+                print("Glob(%s) got:" % repr(input))
                 pprint.pprint(list(map(fmt, r)))
                 self.fail()
 
@@ -3621,7 +3621,7 @@ class SpecialAttrTestCase(unittest.TestCase):
         caught = None
         try:
             fs.Dir('ddd').get_subst_proxy().no_such_attr
-        except AttributeError, e:
+        except AttributeError as e:
             assert str(e) == "Dir instance 'ddd' has no attribute 'no_such_attr'", e
             caught = 1
         assert caught, "did not catch expected AttributeError"
@@ -3629,7 +3629,7 @@ class SpecialAttrTestCase(unittest.TestCase):
         caught = None
         try:
             fs.Entry('eee').get_subst_proxy().no_such_attr
-        except AttributeError, e:
+        except AttributeError as e:
             # Gets disambiguated to File instance by get_subst_proxy().
             assert str(e) == "File instance 'eee' has no attribute 'no_such_attr'", e
             caught = 1
@@ -3638,7 +3638,7 @@ class SpecialAttrTestCase(unittest.TestCase):
         caught = None
         try:
             fs.File('fff').get_subst_proxy().no_such_attr
-        except AttributeError, e:
+        except AttributeError as e:
             assert str(e) == "File instance 'fff' has no attribute 'no_such_attr'", e
             caught = 1
         assert caught, "did not catch expected AttributeError"
diff --git a/src/engine/SCons/Node/__init__.py b/src/engine/SCons/Node/__init__.py
index 992284d..8f48d86 100644
--- a/src/engine/SCons/Node/__init__.py
+++ b/src/engine/SCons/Node/__init__.py
@@ -371,7 +371,7 @@ class Node(object):
         """
         try:
             self.get_executor()(self, **kw)
-        except SCons.Errors.BuildError, e:
+        except SCons.Errors.BuildError as e:
             e.node = self
             raise
 
@@ -827,7 +827,7 @@ class Node(object):
         """Adds dependencies."""
         try:
             self._add_child(self.depends, self.depends_set, depend)
-        except TypeError, e:
+        except TypeError as e:
             e = e.args[0]
             if SCons.Util.is_List(e):
                 s = list(map(str, e))
@@ -844,7 +844,7 @@ class Node(object):
         """Adds dependencies to ignore."""
         try:
             self._add_child(self.ignore, self.ignore_set, depend)
-        except TypeError, e:
+        except TypeError as e:
             e = e.args[0]
             if SCons.Util.is_List(e):
                 s = list(map(str, e))
@@ -858,7 +858,7 @@ class Node(object):
             return
         try:
             self._add_child(self.sources, self.sources_set, source)
-        except TypeError, e:
+        except TypeError as e:
             e = e.args[0]
             if SCons.Util.is_List(e):
                 s = list(map(str, e))
@@ -1197,8 +1197,8 @@ class Node(object):
         new_bkids    = new.bsources    + new.bdepends    + new.bimplicit
         new_bkidsigs = new.bsourcesigs + new.bdependsigs + new.bimplicitsigs
 
-        osig = dict(zip(old_bkids, old_bkidsigs))
-        nsig = dict(zip(new_bkids, new_bkidsigs))
+        osig = dict(list(zip(old_bkids, old_bkidsigs)))
+        nsig = dict(list(zip(new_bkids, new_bkidsigs)))
 
         # The sources and dependencies we'll want to report are all stored
         # as relative paths to this target's directory, but we want to