http://scons.tigris.org/issues/show_bug.cgi?id=2317

Apply the refactorings from the 'dict' fixer, less occurrences that were
manually audited to be safe.  Also pick up changes in bin/sfsum, a Python
file that was not being scanned before.

4 files changed, 5 insertions, 5 deletions

diff --git a/test/ARGUMENTS.py b/test/ARGUMENTS.py
index 801d83a..4bd2f78 100644
--- a/test/ARGUMENTS.py
+++ b/test/ARGUMENTS.py
@@ -30,7 +30,7 @@ test = TestSCons.TestSCons()
 
 test.write('SConstruct', """
 foo = open('foo.out', 'wb')
-for k in sorted(list(ARGUMENTS.keys())):
+for k in sorted(ARGUMENTS.keys()):
     foo.write(k + " = " + ARGUMENTS[k] + "\\n")
 foo.close()
 """)
diff --git a/test/LoadableModule.py b/test/LoadableModule.py
index b28a565..40f9ce8 100644
--- a/test/LoadableModule.py
+++ b/test/LoadableModule.py
@@ -45,7 +45,7 @@ dlopen_line = {
     'freebsd4' : no_dl_lib,
     'linux2' : use_dl_lib,
 }
-platforms_with_dlopen = dlopen_line.keys()
+platforms_with_dlopen = list(dlopen_line.keys())
 
 test.write('SConstruct', """
 env = Environment()
diff --git a/test/SConscript/variables.py b/test/SConscript/variables.py
index 828a62c..0bb3cd0 100644
--- a/test/SConscript/variables.py
+++ b/test/SConscript/variables.py
@@ -44,7 +44,7 @@ assert y == 'zoom'
 test.write("SConstruct", """
 x = 'x'
 y = 'zoom'
-Export(globals().keys())                         
+Export(list(globals().keys()))                         
 SConscript('SConscript')
 """)
 
@@ -54,7 +54,7 @@ test.run(arguments = ".")
 test.write("SConstruct", """
 x = 'x'
 y = 'zoom'
-SConscript('SConscript', globals().keys())
+SConscript('SConscript', list(globals().keys()))
 """)
 
 test.run(arguments = ".")
diff --git a/test/scons-time/help/all-subcommands.py b/test/scons-time/help/all-subcommands.py
index 8641d71..43db3ae 100644
--- a/test/scons-time/help/all-subcommands.py
+++ b/test/scons-time/help/all-subcommands.py
@@ -45,7 +45,7 @@ try: eval(c, globals)
 except: pass
 
 # Extract all subcommands from the the do_*() functions.
-functions = globals['SConsTimer'].__dict__.keys()
+functions = list(globals['SConsTimer'].__dict__.keys())
 do_funcs = [x for x in functions if x[:3] == 'do_']
 
 subcommands = [x[3:] for x in do_funcs]