Use super call instead of direct class call

- super used where direct call to superclass existed
- convert a few older-style super() (two-argument) uses
- in a few places, where there was an intersection with a super change,
  variables that override a builtin (e.g. "dict") were renamed.

Signed-off-by: Mats Wichmann <mats@linux.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/SCons/SConsign.py b/SCons/SConsign.py
index 5b78855..ecca391 100644
--- a/SCons/SConsign.py
+++ b/SCons/SConsign.py
@@ -248,7 +248,7 @@ class DB(Base):
     determined by the database module.
     """
     def __init__(self, dir):
-        Base.__init__(self)
+        super().__init__()
 
         self.dir = dir
 
@@ -319,7 +319,7 @@ class Dir(Base):
         """
         fp - file pointer to read entries from
         """
-        Base.__init__(self)
+        super().__init__()
 
         if not fp:
             return
@@ -352,7 +352,7 @@ class DirFile(Dir):
             fp = None
 
         try:
-            Dir.__init__(self, fp, dir)
+            super().__init__(fp, dir)
         except KeyboardInterrupt:
             raise
         except Exception: