When iterating over dict.items(), we do not need a new list.

40 files changed, 80 insertions, 80 deletions

diff --git a/QMTest/TestSCons.py b/QMTest/TestSCons.py
index e7175fbf..f75a3ccc 100644
--- a/QMTest/TestSCons.py
+++ b/QMTest/TestSCons.py
@@ -1239,7 +1239,7 @@ class TimeSCons(TestSCons):
         self.variables = kw.get('variables')
         default_calibrate_variables = []
         if self.variables is not None:
-            for variable, value in list(self.variables.items()):
+            for variable, value in self.variables.items():
                 value = os.environ.get(variable, value)
                 try:
                     value = int(value)
@@ -1295,7 +1295,7 @@ class TimeSCons(TestSCons):
         """
         if 'options' not in kw and self.variables:
             options = []
-            for variable, value in list(self.variables.items()):
+            for variable, value in self.variables.items():
                 options.append('%s=%s' % (variable, value))
             kw['options'] = ' '.join(options)
         if self.calibrate:
@@ -1321,7 +1321,7 @@ class TimeSCons(TestSCons):
                    self.elapsed_time(),
                    "seconds",
                    sort=0)
-        for name, args in list(stats.items()):
+        for name, args in stats.items():
             self.trace(name, trace, **args)
 
     def uptime(self):
diff --git a/QMTest/scons_tdb.py b/QMTest/scons_tdb.py
index f5c0ae51..76c7fe10 100644
--- a/QMTest/scons_tdb.py
+++ b/QMTest/scons_tdb.py
@@ -92,7 +92,7 @@ def get_explicit_arguments(e):
     # Determine which subset of the 'arguments' have been set
     # explicitly.
     explicit_arguments = {}
-    for name, field in list(arguments.items()):
+    for name, field in arguments.items():
         # Do not record computed fields.
         if field.IsComputed():
             continue
diff --git a/bin/SConsDoc.py b/bin/SConsDoc.py
index 2fe4f73e..d5666443 100644
--- a/bin/SConsDoc.py
+++ b/bin/SConsDoc.py
@@ -598,7 +598,7 @@ class SConsDocTree:
             # Create xpath context
             self.xpath_context = self.doc.xpathNewContext()
             # Register namespaces
-            for key, val in list(self.nsmap.items()):
+            for key, val in self.nsmap.items():
                 self.xpath_context.xpathRegisterNs(key, val)
             
     def __del__(self):
diff --git a/bin/SConsExamples.py b/bin/SConsExamples.py
index a86968d1..dd9bfaf8 100644
--- a/bin/SConsExamples.py
+++ b/bin/SConsExamples.py
@@ -267,7 +267,7 @@ def ensureExampleOutputsExist(dpath):
         os.mkdir(generated_examples)
 
     examples = readAllExampleInfos(dpath)
-    for key, value in list(examples.items()):
+    for key, value in examples.items():
         # Process all scons_output tags
         for o in value.outputs:
             cpath = os.path.join(generated_examples,
@@ -305,7 +305,7 @@ def createAllExampleOutputs(dpath):
     examples = readAllExampleInfos(dpath)
     total = len(examples)
     idx = 0
-    for key, value in list(examples.items()):
+    for key, value in examples.items():
         # Process all scons_output tags
         print("%.2f%s (%d/%d) %s" % (float(idx + 1) * 100.0 / float(total),
                                      perc, idx + 1, total, key))
diff --git a/bin/scons-proc.py b/bin/scons-proc.py
index 0747b2cc..e09c8538 100644
--- a/bin/scons-proc.py
+++ b/bin/scons-proc.py
@@ -104,7 +104,7 @@ Link_Entities_Header = """\
 class SCons_XML(object):
     def __init__(self, entries, **kw):
         self.values = entries
-        for k, v in list(kw.items()):
+        for k, v in kw.items():
             setattr(self, k, v)
             
     def fopen(self, name):
diff --git a/src/engine/SCons/Action.py b/src/engine/SCons/Action.py
index be70293e..fa45f107 100644
--- a/src/engine/SCons/Action.py
+++ b/src/engine/SCons/Action.py
@@ -727,7 +727,7 @@ def _subproc(scons_env, cmd, error = 'ignore', **kw):
 
     # Ensure that the ENV values are all strings:
     new_env = {}
-    for key, value in list(ENV.items()):
+    for key, value in ENV.items():
         if is_List(value):
             # If the value is a list, then we assume it is a path list,
             # because that's a pretty common list-like value to stick
@@ -855,7 +855,7 @@ class CommandAction(_ActionAction):
         ENV = get_default_ENV(env)
 
         # Ensure that the ENV values are all strings:
-        for key, value in list(ENV.items()):
+        for key, value in ENV.items():
             if not is_String(value):
                 if is_List(value):
                     # If the value is a list, then we assume it is a
diff --git a/src/engine/SCons/ActionTests.py b/src/engine/SCons/ActionTests.py
index 4a233f1c..e437c51d 100644
--- a/src/engine/SCons/ActionTests.py
+++ b/src/engine/SCons/ActionTests.py
@@ -132,7 +132,7 @@ class Environment(object):
         self.d['SPAWN'] = scons_env['SPAWN']
         self.d['PSPAWN'] = scons_env['PSPAWN']
         self.d['ESCAPE'] = scons_env['ESCAPE']
-        for k, v in list(kw.items()):
+        for k, v in kw.items():
             self.d[k] = v
     # Just use the underlying scons_subst*() utility methods.
     def subst(self, strSubst, raw=0, target=[], source=[], conv=None):
@@ -157,12 +157,12 @@ class Environment(object):
     def Clone(self, **kw):
         res = Environment()
         res.d = SCons.Util.semi_deepcopy(self.d)
-        for k, v in list(kw.items()):
+        for k, v in kw.items():
             res.d[k] = v
         return res
     def sig_dict(self):
         d = {}
-        for k,v in list(self.items()): d[k] = v
+        for k,v in self.items(): d[k] = v
         d['TARGETS'] = ['__t1__', '__t2__', '__t3__', '__t4__', '__t5__', '__t6__']
         d['TARGET'] = d['TARGETS'][0]
         d['SOURCES'] = ['__s1__', '__s2__', '__s3__', '__s4__', '__s5__', '__s6__']
diff --git a/src/engine/SCons/BuilderTests.py b/src/engine/SCons/BuilderTests.py
index ca35abc0..1e544a13 100644
--- a/src/engine/SCons/BuilderTests.py
+++ b/src/engine/SCons/BuilderTests.py
@@ -79,7 +79,7 @@ class Environment(object):
         self.d['SHELL'] = scons_env['SHELL']
         self.d['SPAWN'] = scons_env['SPAWN']
         self.d['ESCAPE'] = scons_env['ESCAPE']
-        for k, v in list(kw.items()):
+        for k, v in kw.items():
             self.d[k] = v
         global env_arg2nodes_called
         env_arg2nodes_called = None
@@ -140,7 +140,7 @@ class Environment(object):
         return list(self.d.items())
     def sig_dict(self):
         d = {}
-        for k,v in list(self.items()): d[k] = v
+        for k,v in self.items(): d[k] = v
         d['TARGETS'] = ['__t1__', '__t2__', '__t3__', '__t4__', '__t5__', '__t6__']
         d['TARGET'] = d['TARGETS'][0]
         d['SOURCES'] = ['__s1__', '__s2__', '__s3__', '__s4__', '__s5__', '__s6__']
diff --git a/src/engine/SCons/Debug.py b/src/engine/SCons/Debug.py
index 6ac5f27d..9e520ff9 100644
--- a/src/engine/SCons/Debug.py
+++ b/src/engine/SCons/Debug.py
@@ -89,7 +89,7 @@ def dumpLoggedInstances(classes, file=sys.stdout):
             obj = ref()
             if obj is not None:
                 file.write('    %s:\n' % obj)
-                for key, value in list(obj.__dict__.items()):
+                for key, value in obj.__dict__.items():
                     file.write('        %20s : %s\n' % (key, value))
 
 
@@ -163,7 +163,7 @@ def caller_trace(back=0):
 # print a single caller and its callers, if any
 def _dump_one_caller(key, file, level=0):
     leader = '      '*level
-    for v,c in sorted([(-v,c) for c,v in list(caller_dicts[key].items())]):
+    for v,c in sorted([(-v,c) for c,v in caller_dicts[key].items()]):
         file.write("%s  %6d %s:%d(%s)\n" % ((leader,-v) + func_shorten(c[-3:])))
         if c in caller_dicts:
             _dump_one_caller(c, file, level+1)
diff --git a/src/engine/SCons/Defaults.py b/src/engine/SCons/Defaults.py
index f0959829..f1d5bcab 100644
--- a/src/engine/SCons/Defaults.py
+++ b/src/engine/SCons/Defaults.py
@@ -459,7 +459,7 @@ def processDefines(defs):
                 else:
                     l.append(str(d[0]))
             elif SCons.Util.is_Dict(d):
-                for macro,value in list(d.items()):
+                for macro,value in d.items():
                     if value is not None:
                         l.append(str(macro) + '=' + str(value))
                     else:
diff --git a/src/engine/SCons/Environment.py b/src/engine/SCons/Environment.py
index ed8ef786..85f9fa77 100644
--- a/src/engine/SCons/Environment.py
+++ b/src/engine/SCons/Environment.py
@@ -152,7 +152,7 @@ def _set_BUILDERS(env, key, value):
     except KeyError:
         bd = BuilderDict(kwbd, env)
         env._dict[key] = bd
-    for k, v in list(value.items()):
+    for k, v in value.items():
         if not SCons.Builder.is_a_Builder(v):
             raise SCons.Errors.UserError('%s is not a Builder.' % repr(v))
     bd.update(value)
@@ -324,7 +324,7 @@ class BuilderDict(UserDict):
         delattr(self.env, item)
 
     def update(self, dict):
-        for i, v in list(dict.items()):
+        for i, v in dict.items():
             self.__setitem__(i, v)
 
 
@@ -515,7 +515,7 @@ class SubstitutionEnvironment(object):
 
     def subst_kw(self, kw, raw=0, target=None, source=None):
         nkw = {}
-        for k, v in list(kw.items()):
+        for k, v in kw.items():
             k = self.subst(k, raw, target, source)
             if SCons.Util.is_String(v):
                 v = self.subst(v, raw, target, source)
@@ -627,7 +627,7 @@ class SubstitutionEnvironment(object):
         if not o: return self
         overrides = {}
         merges = None
-        for key, value in list(o.items()):
+        for key, value in o.items():
             if key == 'parse_flags':
                 merges = value
             else:
@@ -815,7 +815,7 @@ class SubstitutionEnvironment(object):
         if not unique:
             self.Append(**args)
             return self
-        for key, value in list(args.items()):
+        for key, value in args.items():
             if not value:
                 continue
             try:
@@ -984,7 +984,7 @@ class Base(SubstitutionEnvironment):
         # Now restore the passed-in and customized variables
         # to the environment, since the values the user set explicitly
         # should override any values set by the tools.
-        for key, val in list(save.items()):
+        for key, val in save.items():
             self._dict[key] = val
 
         # Finally, apply any flags to be merged in
@@ -1131,7 +1131,7 @@ class Base(SubstitutionEnvironment):
         in an Environment.
         """
         kw = copy_non_reserved_keywords(kw)
-        for key, val in list(kw.items()):
+        for key, val in kw.items():
             # It would be easier on the eyes to write this using
             # "continue" statements whenever we finish processing an item,
             # but Python 1.5.2 apparently doesn't let you use "continue"
@@ -1201,7 +1201,7 @@ class Base(SubstitutionEnvironment):
                             update_dict(val)
                         except (AttributeError, TypeError, ValueError):
                             if SCons.Util.is_Dict(val):
-                                for k, v in list(val.items()):
+                                for k, v in val.items():
                                     orig[k] = v
                             else:
                                 orig[val] = None
@@ -1247,7 +1247,7 @@ class Base(SubstitutionEnvironment):
         values move to end.
         """
         kw = copy_non_reserved_keywords(kw)
-        for key, val in list(kw.items()):
+        for key, val in kw.items():
             if SCons.Util.is_List(val):
                 val = _delete_duplicates(val, delete_existing)
             if key not in self._dict or self._dict[key] in ('', None):
@@ -1363,7 +1363,7 @@ class Base(SubstitutionEnvironment):
                                 val = [val]
                         elif SCons.Util.is_Dict(val):
                             tmp = []
-                            for i,j in list(val.items()):
+                            for i,j in val.items():
                                 if j is not None:
                                     tmp.append((i,j))
                                 else:
@@ -1405,7 +1405,7 @@ class Base(SubstitutionEnvironment):
         # so the tools can use the new variables
         kw = copy_non_reserved_keywords(kw)
         new = {}
-        for key, value in list(kw.items()):
+        for key, value in kw.items():
             new[key] = SCons.Subst.scons_subst_once(value, self, key)
         clone.Replace(**new)
 
@@ -1605,7 +1605,7 @@ class Base(SubstitutionEnvironment):
         in an Environment.
         """
         kw = copy_non_reserved_keywords(kw)
-        for key, val in list(kw.items()):
+        for key, val in kw.items():
             # It would be easier on the eyes to write this using
             # "continue" statements whenever we finish processing an item,
             # but Python 1.5.2 apparently doesn't let you use "continue"
@@ -1659,7 +1659,7 @@ class Base(SubstitutionEnvironment):
                             update_dict(val)
                         except (AttributeError, TypeError, ValueError):
                             if SCons.Util.is_Dict(val):
-                                for k, v in list(val.items()):
+                                for k, v in val.items():
                                     orig[k] = v
                             else:
                                 orig[val] = None
@@ -1696,7 +1696,7 @@ class Base(SubstitutionEnvironment):
         values move to front.
         """
         kw = copy_non_reserved_keywords(kw)
-        for key, val in list(kw.items()):
+        for key, val in kw.items():
             if SCons.Util.is_List(val):
                 val = _delete_duplicates(val, not delete_existing)
             if key not in self._dict or self._dict[key] in ('', None):
diff --git a/src/engine/SCons/EnvironmentTests.py b/src/engine/SCons/EnvironmentTests.py
index c51dd308..5a14ffcc 100644
--- a/src/engine/SCons/EnvironmentTests.py
+++ b/src/engine/SCons/EnvironmentTests.py
@@ -164,7 +164,7 @@ class TestEnvironmentFixture(object):
         default_keys = { 'CC' : 'cc',
                          'CCFLAGS' : '-DNDEBUG',
                          'ENV' : { 'TMP' : '/tmp' } }
-        for key, value in list(default_keys.items()):
+        for key, value in default_keys.items():
             if key not in kw:
                 kw[key] = value
         if 'BUILDERS' not in kw:
diff --git a/src/engine/SCons/Node/Alias.py b/src/engine/SCons/Node/Alias.py
index f229a9fa..a035816c 100644
--- a/src/engine/SCons/Node/Alias.py
+++ b/src/engine/SCons/Node/Alias.py
@@ -89,7 +89,7 @@ class AliasNodeInfo(SCons.Node.NodeInfoBase):
         """
         # TODO check or discard version
         del state['_version_id']
-        for key, value in list(state.items()):
+        for key, value in state.items():
             if key not in ('__weakref__',):
                 setattr(self, key, value)
           
diff --git a/src/engine/SCons/Node/FS.py b/src/engine/SCons/Node/FS.py
index 9b057be2..907bc75d 100644
--- a/src/engine/SCons/Node/FS.py
+++ b/src/engine/SCons/Node/FS.py
@@ -2203,7 +2203,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 list(dir.entries.items())
+            node_names = [ v.name for k, v in dir.entries.items()
                            if k not in ('.', '..') ]
             names.extend(node_names)
             if not strings:
@@ -2482,7 +2482,7 @@ class FileNodeInfo(SCons.Node.NodeInfoBase):
         """
         # TODO check or discard version
         del state['_version_id']
-        for key, value in list(state.items()):
+        for key, value in state.items():
             if key not in ('__weakref__',):
                 setattr(self, key, value)
 
diff --git a/src/engine/SCons/Node/Python.py b/src/engine/SCons/Node/Python.py
index 92cc3204..f151fc5e 100644
--- a/src/engine/SCons/Node/Python.py
+++ b/src/engine/SCons/Node/Python.py
@@ -67,7 +67,7 @@ class ValueNodeInfo(SCons.Node.NodeInfoBase):
         """
         # TODO check or discard version
         del state['_version_id']
-        for key, value in list(state.items()):
+        for key, value in state.items():
             if key not in ('__weakref__',):
                 setattr(self, key, value)
 
diff --git a/src/engine/SCons/Node/__init__.py b/src/engine/SCons/Node/__init__.py
index 8e00fdbd..f7d20824 100644
--- a/src/engine/SCons/Node/__init__.py
+++ b/src/engine/SCons/Node/__init__.py
@@ -430,7 +430,7 @@ class NodeInfoBase(object):
         # TODO check or discard version
         del state['_version_id']
 
-        for key, value in list(state.items()):
+        for key, value in state.items():
             if key not in ('__weakref__',):
                 setattr(self, key, value)
 
@@ -493,7 +493,7 @@ class BuildInfoBase(object):
         """
         # TODO check or discard version
         del state['_version_id']
-        for key, value in list(state.items()):
+        for key, value in state.items():
             if key not in ('__weakref__',):
                 setattr(self, key, value)
 
diff --git a/src/engine/SCons/SConsign.py b/src/engine/SCons/SConsign.py
index 3bd4b71f..5042aa1d 100644
--- a/src/engine/SCons/SConsign.py
+++ b/src/engine/SCons/SConsign.py
@@ -160,7 +160,7 @@ class SConsignEntry(object):
         return state
 
     def __setstate__(self, state):
-        for key, value in list(state.items()):
+        for key, value in state.items():
             if key not in ('_version_id','__weakref__'):
                 setattr(self, key, value)
 
@@ -205,7 +205,7 @@ class Base(object):
         pass
 
     def merge(self):
-        for key, node in list(self.to_be_merged.items()):
+        for key, node in self.to_be_merged.items():
             entry = node.get_stored_info()
             try:
                 ninfo = entry.ninfo
@@ -252,7 +252,7 @@ class DB(Base):
             except Exception as e:
                 SCons.Warnings.warn(SCons.Warnings.CorruptSConsignWarning,
                                     "Ignoring corrupt sconsign entry : %s (%s)\n"%(self.dir.get_tpath(), e))
-            for key, entry in list(self.entries.items()):
+            for key, entry in self.entries.items():
                 entry.convert_from_sconsign(dir, key)
 
         if mode == "r":
@@ -279,7 +279,7 @@ class DB(Base):
         # the Repository; we only write to our own .sconsign file,
         # not to .sconsign files in Repositories.
         path = normcase(self.dir.get_internal_path())
-        for key, entry in list(self.entries.items()):
+        for key, entry in self.entries.items():
             entry.convert_to_sconsign()
         db[path] = pickle.dumps(self.entries, PICKLE_PROTOCOL)
 
@@ -309,7 +309,7 @@ class Dir(Base):
             raise TypeError
 
         if dir:
-            for key, entry in list(self.entries.items()):
+            for key, entry in self.entries.items():
                 entry.convert_from_sconsign(dir, key)
 
 
@@ -369,7 +369,7 @@ class DirFile(Dir):
                 fname = self.sconsign
             except IOError:
                 return
-        for key, entry in list(self.entries.items()):
+        for key, entry in self.entries.items():
             entry.convert_to_sconsign()
         pickle.dump(self.entries, file, PICKLE_PROTOCOL)
         file.close()
diff --git a/src/engine/SCons/Scanner/LaTeX.py b/src/engine/SCons/Scanner/LaTeX.py
index cb89cf0c..0c54bf30 100644
--- a/src/engine/SCons/Scanner/LaTeX.py
+++ b/src/engine/SCons/Scanner/LaTeX.py
@@ -224,14 +224,14 @@ class LaTeX(SCons.Scanner.Base):
             """
             def __init__(self, dictionary):
                 self.dictionary = {}
-                for k,n in list(dictionary.items()):
+                for k,n in 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 list(self.dictionary.items()):
+                for k,(c,cENV)  in 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/Script/Interactive.py b/src/engine/SCons/Script/Interactive.py
index cf6e2474..6be7b270 100644
--- a/src/engine/SCons/Script/Interactive.py
+++ b/src/engine/SCons/Script/Interactive.py
@@ -121,7 +121,7 @@ class SConsInteractiveCmd(cmd.Cmd):
 
     def __init__(self, **kw):
         cmd.Cmd.__init__(self)
-        for key, val in list(kw.items()):
+        for key, val in kw.items():
             setattr(self, key, val)
 
         if sys.platform == 'win32':
diff --git a/src/engine/SCons/Script/SConscript.py b/src/engine/SCons/Script/SConscript.py
index 4e63f6c1..8609892a 100644
--- a/src/engine/SCons/Script/SConscript.py
+++ b/src/engine/SCons/Script/SConscript.py
@@ -526,7 +526,7 @@ class SConsEnvironment(SCons.Environment.Base):
             return x
         ls = list(map(subst_element, ls))
         subst_kw = {}
-        for key, val in list(kw.items()):
+        for key, val in kw.items():
             if SCons.Util.is_String(val):
                 val = self.subst(val)
             elif SCons.Util.is_List(val):
diff --git a/src/engine/SCons/Taskmaster.py b/src/engine/SCons/Taskmaster.py
index 47a4c908..bd94972d 100644
--- a/src/engine/SCons/Taskmaster.py
+++ b/src/engine/SCons/Taskmaster.py
@@ -479,7 +479,7 @@ class Task(object):
                         if p.ref_count == 0:
                             self.tm.candidates.append(p)
 
-        for p, subtract in list(parents.items()):
+        for p, subtract in parents.items():
             p.ref_count = p.ref_count - subtract
             if T: T.write(self.trace_message(u'Task.postprocess()',
                                              p,
diff --git a/src/engine/SCons/Tool/MSCommon/common.py b/src/engine/SCons/Tool/MSCommon/common.py
index b14eba18..41cd8892 100644
--- a/src/engine/SCons/Tool/MSCommon/common.py
+++ b/src/engine/SCons/Tool/MSCommon/common.py
@@ -219,7 +219,7 @@ def parse_output(output, keep = ("INCLUDE", "LIB", "LIBPATH", "PATH")):
                 dkeep[key].append(p)
 
     for line in output.splitlines():
-        for k,v in list(rdk.items()):
+        for k,v in rdk.items():
             m = v.match(line)
             if m:
                 add_env(m, k)
diff --git a/src/engine/SCons/Tool/MSCommon/vc.py b/src/engine/SCons/Tool/MSCommon/vc.py
index 588fe98c..7b8dd9d1 100644
--- a/src/engine/SCons/Tool/MSCommon/vc.py
+++ b/src/engine/SCons/Tool/MSCommon/vc.py
@@ -515,7 +515,7 @@ def msvc_setup_env(env):
         SCons.Warnings.warn(SCons.Warnings.VisualCMissingWarning, warn_msg)
         return None
 
-    for k, v in list(d.items()):
+    for k, v in d.items():
         debug('vc.py:msvc_setup_env() env:%s -> %s'%(k,v))
         env.PrependENVPath(k, v, delete_existing=True)
 
diff --git a/src/engine/SCons/Tool/MSCommon/vs.py b/src/engine/SCons/Tool/MSCommon/vs.py
index 4bda4060..31197ef0 100644
--- a/src/engine/SCons/Tool/MSCommon/vs.py
+++ b/src/engine/SCons/Tool/MSCommon/vs.py
@@ -545,7 +545,7 @@ def msvs_setup_env(env):
             env['ENV'] = save_ENV
         vars = parse_output(output, vars)
 
-        for k, v in list(vars.items()):
+        for k, v in vars.items():
             env.PrependENVPath(k, v, delete_existing=1)
 
 def query_versions():
diff --git a/src/engine/SCons/Tool/aixlink.py b/src/engine/SCons/Tool/aixlink.py
index 3117c551..bfddf0ac 100644
--- a/src/engine/SCons/Tool/aixlink.py
+++ b/src/engine/SCons/Tool/aixlink.py
@@ -65,7 +65,7 @@ def exists(env):
     # TODO: sync with link.smart_link() to choose a linker
     linkers = { 'CXX': ['aixc++'], 'CC': ['aixcc'] }
     alltools = []
-    for langvar, linktools in list(linkers.items()):
+    for langvar, linktools in linkers.items():
         if langvar in env: # use CC over CXX when user specified CC but not CXX
             return SCons.Tool.FindTool(linktools, env)
         alltools.extend(linktools)
diff --git a/src/engine/SCons/Tool/gnulink.py b/src/engine/SCons/Tool/gnulink.py
index cf1ce859..b1d50886 100644
--- a/src/engine/SCons/Tool/gnulink.py
+++ b/src/engine/SCons/Tool/gnulink.py
@@ -67,7 +67,7 @@ def exists(env):
     # TODO: sync with link.smart_link() to choose a linker
     linkers = { 'CXX': ['g++'], 'CC': ['gcc'] }
     alltools = []
-    for langvar, linktools in list(linkers.items()):
+    for langvar, linktools in linkers.items():
         if langvar in env: # use CC over CXX when user specified CC but not CXX
             return SCons.Tool.FindTool(linktools, env)
         alltools.extend(linktools)
diff --git a/src/engine/SCons/Tool/msvs.py b/src/engine/SCons/Tool/msvs.py
index 939668e9..67f9ada9 100644
--- a/src/engine/SCons/Tool/msvs.py
+++ b/src/engine/SCons/Tool/msvs.py
@@ -213,7 +213,7 @@ class _UserGenerator(object):
 
         if self.createfile:
             dbg_settings = dict(list(zip(variants, dbg_settings)))
-            for var, src in list(dbg_settings.items()):
+            for var, src in dbg_settings.items():
                 # Update only expected keys
                 trg = {}
                 for key in [k for k in list(self.usrdebg.keys()) if k in src]:
@@ -303,7 +303,7 @@ class _GenerateV7User(_UserGenerator):
             debug = self.configs[kind].debug
             if debug:
                 debug_settings = '\n'.join(['\t\t\t\t%s="%s"' % (key, xmlify(value))
-                                            for key, value in list(debug.items())
+                                            for key, value in debug.items()
                                             if value is not None])
                 self.usrfile.write(self.usrconf % locals())
         self.usrfile.write('\t</Configurations>\n</VisualStudioUserFile>')
@@ -365,7 +365,7 @@ class _GenerateV10User(_UserGenerator):
             debug = self.configs[kind].debug
             if debug:
                 debug_settings = '\n'.join(['\t\t<%s>%s</%s>' % (key, xmlify(value), key)
-                                            for key, value in list(debug.items())
+                                            for key, value in debug.items()
                                             if value is not None])
                 self.usrfile.write(self.usrconf % locals())
         self.usrfile.write('</Project>')
@@ -924,7 +924,7 @@ class _GenerateV7DSP(_DSPGenerator, _GenerateV7User):
             self.file.write(pdata + '-->\n')
 
     def printSources(self, hierarchy, commonprefix):
-        sorteditems = sorted(list(hierarchy.items()), key=lambda a: a[0].lower())
+        sorteditems = sorted(hierarchy.items(), key=lambda a: a[0].lower())
 
         # First folders, then files
         for key, value in sorteditems:
@@ -1243,7 +1243,7 @@ class _GenerateV10DSP(_DSPGenerator, _GenerateV10User):
             self.file.write(pdata + '-->\n')
 
     def printFilters(self, hierarchy, name):
-        sorteditems = sorted(list(hierarchy.items()), key = lambda a: a[0].lower())
+        sorteditems = sorted(hierarchy.items(), key = lambda a: a[0].lower())
 
         for key, value in sorteditems:
             if SCons.Util.is_Dict(value):
@@ -1260,7 +1260,7 @@ class _GenerateV10DSP(_DSPGenerator, _GenerateV10User):
                     'Resource Files': 'None',
                     'Other Files': 'None'}
 
-        sorteditems = sorted(list(hierarchy.items()), key = lambda a: a[0].lower())
+        sorteditems = sorted(hierarchy.items(), key = lambda a: a[0].lower())
 
         # First folders, then files
         for key, value in sorteditems:
diff --git a/src/engine/SCons/Tool/packaging/__init__.py b/src/engine/SCons/Tool/packaging/__init__.py
index 8aa4787b..dc4b80da 100644
--- a/src/engine/SCons/Tool/packaging/__init__.py
+++ b/src/engine/SCons/Tool/packaging/__init__.py
@@ -72,7 +72,7 @@ def Tag(env, target, source, *more_tags, **kw_tags):
         target=env.Flatten(target)
 
     for t in target:
-        for (k,v) in list(kw_tags.items()):
+        for (k,v) in kw_tags.items():
             # all file tags have to start with PACKAGING_, so we can later
             # differentiate between "normal" object attributes and the
             # packaging attributes. As the user should not be bothered with
diff --git a/src/engine/SCons/Tool/packaging/msi.py b/src/engine/SCons/Tool/packaging/msi.py
index 73d3567e..c25f856b 100644
--- a/src/engine/SCons/Tool/packaging/msi.py
+++ b/src/engine/SCons/Tool/packaging/msi.py
@@ -172,7 +172,7 @@ def generate_guids(root):
 
     # find all XMl nodes matching the key, retrieve their attribute, hash their
     # subtree, convert hash to string and add as a attribute to the xml node.
-    for (key,value) in list(needs_id.items()):
+    for (key,value) in needs_id.items():
         node_list = root.getElementsByTagName(key)
         attribute = value
         for node in node_list:
@@ -335,7 +335,7 @@ def build_wxsfile_file_section(root, files, NAME, VERSION, VENDOR, filename_set,
             }
 
         # fill in the default tags given above.
-        for k,v in [ (k, v) for (k,v) in list(h.items()) if not hasattr(file, k) ]:
+        for k,v in [ (k, v) for (k,v) in h.items() if not hasattr(file, k) ]:
             setattr( file, k, v )
 
         File = factory.createElement( 'File' )
@@ -382,7 +382,7 @@ def build_wxsfile_features_section(root, files, NAME, VERSION, SUMMARY, id_set):
     Feature.attributes['Description']           = escape( SUMMARY )
     Feature.attributes['Display']               = 'expand'
 
-    for (feature, files) in list(create_feature_dict(files).items()):
+    for (feature, files) in create_feature_dict(files).items():
         SubFeature   = factory.createElement('Feature')
         SubFeature.attributes['Level'] = '1'
 
diff --git a/src/engine/SCons/Tool/packaging/rpm.py b/src/engine/SCons/Tool/packaging/rpm.py
index 0931c77b..a3481a43 100644
--- a/src/engine/SCons/Tool/packaging/rpm.py
+++ b/src/engine/SCons/Tool/packaging/rpm.py
@@ -332,7 +332,7 @@ class SimpleTagCompiler(object):
         international = [t for t in replacements if is_international(t[0])]
         for key, replacement in international:
             try:
-                x = [t for t in list(values.items()) if strip_country_code(t[0]) == key]
+                x = [t for t in values.items() if strip_country_code(t[0]) == key]
                 int_values_for_key = [(get_country_code(t[0]),t[1]) for t in x]
                 for v in int_values_for_key:
                     str = str + replacement % v
diff --git a/src/engine/SCons/Tool/rpmutils.py b/src/engine/SCons/Tool/rpmutils.py
index d4db4178..3eeed1df 100644
--- a/src/engine/SCons/Tool/rpmutils.py
+++ b/src/engine/SCons/Tool/rpmutils.py
@@ -520,7 +520,7 @@ def updateRpmDicts(rpmrc, pyfile):
                 if l.startswith('# Start of rpmrc dictionaries'):
                     pm = 1
                     # Write data sections to single dictionaries
-                    for key, entries in list(data.items()):
+                    for key, entries in data.items():
                         out.write("%s = {\n" % key)
                         for arch in sorted(entries.keys()):
                             out.write("  '%s' : ['%s'],\n" % (arch, "','".join(entries[arch])))
diff --git a/src/engine/SCons/Util.py b/src/engine/SCons/Util.py
index d6f18cc2..83202a5f 100644
--- a/src/engine/SCons/Util.py
+++ b/src/engine/SCons/Util.py
@@ -514,7 +514,7 @@ _semi_deepcopy_dispatch = d = {}
 
 def semi_deepcopy_dict(x, exclude = [] ):
     copy = {}
-    for key, val in list(x.items()):
+    for key, val in x.items():
         # The regular Python copy.deepcopy() also deepcopies the key,
         # as follows:
         #
@@ -1074,7 +1074,7 @@ class OrderedDict(UserDict):
         if key not in self._keys: self._keys.append(key)
 
     def update(self, dict):
-        for (key, val) in list(dict.items()):
+        for (key, val) in dict.items():
             self.__setitem__(key, val)
 
     def values(self):
@@ -1096,7 +1096,7 @@ class Selector(OrderedDict):
             # Try to perform Environment substitution on the keys of
             # the dictionary before giving up.
             s_dict = {}
-            for (k,v) in list(self.items()):
+            for (k,v) in self.items():
                 if k is not None:
                     s_k = env.subst(k)
                     if s_k in s_dict:
diff --git a/src/engine/SCons/Variables/EnumVariableTests.py b/src/engine/SCons/Variables/EnumVariableTests.py
index edc29738..931dfe2b 100644
--- a/src/engine/SCons/Variables/EnumVariableTests.py
+++ b/src/engine/SCons/Variables/EnumVariableTests.py
@@ -124,7 +124,7 @@ class EnumVariableTestCase(unittest.TestCase):
             'C'     : ['C',     'three', 'three'],
         }
 
-        for k, l in list(table.items()):
+        for k, l in table.items():
             x = o0.converter(k)
             assert x == l[0], "o0 got %s, expected %s" % (x, l[0])
             x = o1.converter(k)
@@ -188,7 +188,7 @@ class EnumVariableTestCase(unittest.TestCase):
             'no_v'  : [invalid, invalid, invalid],
         }
 
-        for v, l in list(table.items()):
+        for v, l in table.items():
             l[0](o0, v)
             l[1](o1, v)
             l[2](o2, v)
diff --git a/src/engine/SCons/Variables/__init__.py b/src/engine/SCons/Variables/__init__.py
index ce3541cd..b03e5b53 100644
--- a/src/engine/SCons/Variables/__init__.py
+++ b/src/engine/SCons/Variables/__init__.py
@@ -185,7 +185,7 @@ class Variables(object):
         if args is None:
             args = self.args
 
-        for arg, value in list(args.items()):
+        for arg, value in args.items():
             added = False
             for option in self.options:
                 if arg in list(option.aliases) + [ option.key ]:
diff --git a/src/engine/SCons/cpp.py b/src/engine/SCons/cpp.py
index 8212cc16..f282ba78 100644
--- a/src/engine/SCons/cpp.py
+++ b/src/engine/SCons/cpp.py
@@ -72,7 +72,7 @@ cpp_lines_dict = {
 # the corresponding compiled regular expression that fetches the arguments
 # we care about.
 Table = {}
-for op_list, expr in list(cpp_lines_dict.items()):
+for op_list, expr in cpp_lines_dict.items():
     e = re.compile(expr)
     for op in op_list:
         Table[op] = e
diff --git a/src/script/scons-configure-cache.py b/src/script/scons-configure-cache.py
index 2648acda..73ccf184 100644
--- a/src/script/scons-configure-cache.py
+++ b/src/script/scons-configure-cache.py
@@ -99,7 +99,7 @@ for param in config_entries:
 parser.add_argument('--version', action='version', version='%(prog)s 1.0')
 
 # Get the command line as a dict without any of the unspecified entries.
-args = dict([x for x in list(vars(parser.parse_args()).items()) if x[1]])
+args = dict([x for x in vars(parser.parse_args()).items() if x[1]])
 
 # It seems somewhat strange to me, but positional arguments don't get the -
 # in the name changed to _, whereas optional arguments do...
@@ -136,4 +136,4 @@ for key in args:
 
 # and write the updated config file
 with open('config', 'w') as conf:
-    json.dump(config, conf)
\ No newline at end of file
+    json.dump(config, conf)
diff --git a/src/script/scons-time.py b/src/script/scons-time.py
index c788e50f..1473c42b 100644
--- a/src/script/scons-time.py
+++ b/src/script/scons-time.py
@@ -654,7 +654,7 @@ class SConsTimer(object):
             sys.stderr.write('%s  Cannot use the "func" subcommand.\n' % self.name_spaces)
             sys.exit(1)
         statistics = pstats.Stats(file).stats
-        matches = [ e for e in list(statistics.items()) if e[0][2] == function ]
+        matches = [ e for e in statistics.items() if e[0][2] == function ]
         r = matches[0]
         return r[0][0], r[0][1], r[0][2], r[1][3]
 
diff --git a/src/test_files.py b/src/test_files.py
index ef276069..1eee11d9 100644
--- a/src/test_files.py
+++ b/src/test_files.py
@@ -78,7 +78,7 @@ check = {
 missing = []
 no_result = []
 
-for directory, check_list in list(check.items()):
+for directory, check_list in check.items():
     if os.path.exists(directory):
         for c in check_list:
             f = os.path.join(directory, c)
diff --git a/test/AS/nasm.py b/test/AS/nasm.py
index b436a75e..1733789d 100644
--- a/test/AS/nasm.py
+++ b/test/AS/nasm.py
@@ -69,7 +69,7 @@ else:
 # anyway...).
 nasm_format = 'elf'
 format_map = {}
-for k, v in list(format_map.items()):
+for k, v in format_map.items():
     if sys.platform.find(k) != -1:
         nasm_format = v
         break
diff --git a/test/QT/QTFLAGS.py b/test/QT/QTFLAGS.py
index e29ee803..f6aa00fd 100644
--- a/test/QT/QTFLAGS.py
+++ b/test/QT/QTFLAGS.py
@@ -147,7 +147,7 @@ test.must_exist(['work1', 'mmmmocFromH.cxx'],
                 ['work1', 'mmmanother_ui_file.cxx'])
 
 def _flagTest(test,fileToContentsStart):
-    for f,c in list(fileToContentsStart.items()):
+    for f,c in fileToContentsStart.items():
         if test.read(test.workpath('work1', f)).find(c) != 0:
             return 1
     return 0