235 files changed, 174 insertions, 459 deletions

diff --git a/test/AS/ASCOM.py b/test/AS/ASCOM.py
index 4292581..6ad7e6e 100644
--- a/test/AS/ASCOM.py
+++ b/test/AS/ASCOM.py
@@ -29,7 +29,6 @@ Test the ability to configure the $ASCOM construction variable.
 """
 
 import os
-import string
 import sys
 import TestSCons
 
diff --git a/test/AS/ASCOMSTR.py b/test/AS/ASCOMSTR.py
index 287da16..d146229 100644
--- a/test/AS/ASCOMSTR.py
+++ b/test/AS/ASCOMSTR.py
@@ -30,7 +30,6 @@ the assembly output.
 """
 
 import os
-import string
 import sys
 import TestSCons
 
diff --git a/test/AS/ASFLAGS.py b/test/AS/ASFLAGS.py
index a0da9ff..7297620 100644
--- a/test/AS/ASFLAGS.py
+++ b/test/AS/ASFLAGS.py
@@ -24,7 +24,6 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-import os
 import string
 import sys
 import TestSCons
diff --git a/test/AS/ASPP.py b/test/AS/ASPP.py
index 2045a3d..f2c3e44 100644
--- a/test/AS/ASPP.py
+++ b/test/AS/ASPP.py
@@ -24,7 +24,6 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-import os
 import string
 import sys
 import TestSCons
diff --git a/test/AS/ASPPCOM.py b/test/AS/ASPPCOM.py
index bb330dc..6f2bde5 100644
--- a/test/AS/ASPPCOM.py
+++ b/test/AS/ASPPCOM.py
@@ -28,8 +28,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 Test the ability to configure the $ASPPCOM construction variable.
 """
 
-import os
-import string
 import sys
 import TestSCons
 
diff --git a/test/AS/ASPPCOMSTR.py b/test/AS/ASPPCOMSTR.py
index 1956154..37a61df 100644
--- a/test/AS/ASPPCOMSTR.py
+++ b/test/AS/ASPPCOMSTR.py
@@ -29,7 +29,6 @@ Test that the $ASPPCOMSTR construction variable allows you to customize
 the displayed assembler string.
 """
 
-import os
 import string
 import sys
 import TestSCons
diff --git a/test/AS/ASPPFLAGS.py b/test/AS/ASPPFLAGS.py
index 27858bd..2410435 100644
--- a/test/AS/ASPPFLAGS.py
+++ b/test/AS/ASPPFLAGS.py
@@ -24,7 +24,6 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-import os
 import string
 import sys
 import TestSCons
diff --git a/test/Actions/append.py b/test/Actions/append.py
index fa3bb64..4b13107 100644
--- a/test/Actions/append.py
+++ b/test/Actions/append.py
@@ -51,7 +51,6 @@ int main(void)
 """)
 
 test.write('SConstruct', """
-import os.path
 
 env=Environment()
 
diff --git a/test/Actions/pre-post.py b/test/Actions/pre-post.py
index 674c628..647b6e9 100644
--- a/test/Actions/pre-post.py
+++ b/test/Actions/pre-post.py
@@ -28,7 +28,6 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os
-import os.path
 import stat
 import sys
 import TestSCons
diff --git a/test/AddOption/basic.py b/test/AddOption/basic.py
index 57ee11e..b41b63a 100644
--- a/test/AddOption/basic.py
+++ b/test/AddOption/basic.py
@@ -29,8 +29,6 @@ Verify the help text when the AddOption() function is used (and when
 it's not).
 """
 
-import string
-
 import TestSCons
 
 test = TestSCons.TestSCons()
diff --git a/test/AddOption/optional-arg.py b/test/AddOption/optional-arg.py
index f7a0337..2bf849e 100644
--- a/test/AddOption/optional-arg.py
+++ b/test/AddOption/optional-arg.py
@@ -29,8 +29,6 @@ Verify use of the nargs='?' keyword argument to specify a long
 command-line option with an optional argument value.
 """
 
-import string
-
 import TestSCons
 
 test = TestSCons.TestSCons()
diff --git a/test/Alias/action.py b/test/Alias/action.py
index ea0eac2..263df3c 100644
--- a/test/Alias/action.py
+++ b/test/Alias/action.py
@@ -28,10 +28,7 @@ Test that Aliases with actions work.
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-import os
-import sys
 import TestSCons
-import TestCmd
 
 test = TestSCons.TestSCons()
 
diff --git a/test/Alias/errors.py b/test/Alias/errors.py
index 36876c4..964bae4 100644
--- a/test/Alias/errors.py
+++ b/test/Alias/errors.py
@@ -24,10 +24,7 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-import os
-import sys
 import TestSCons
-import TestCmd
 
 test = TestSCons.TestSCons()
 
diff --git a/test/Alias/scanner.py b/test/Alias/scanner.py
index 3ce14dd..b6254e9 100644
--- a/test/Alias/scanner.py
+++ b/test/Alias/scanner.py
@@ -28,10 +28,7 @@ Test that an Alias of a node with a Scanner works.
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-import os
-import sys
 import TestSCons
-import TestCmd
 
 test = TestSCons.TestSCons()
 
diff --git a/test/AlwaysBuild.py b/test/AlwaysBuild.py
index d1f07fd..5b59ae4 100644
--- a/test/AlwaysBuild.py
+++ b/test/AlwaysBuild.py
@@ -26,7 +26,7 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os
-import sys
+
 import TestSCons
 
 test = TestSCons.TestSCons()
diff --git a/test/CC/CCCOM.py b/test/CC/CCCOM.py
index ca13ec8..9cc5430 100644
--- a/test/CC/CCCOM.py
+++ b/test/CC/CCCOM.py
@@ -29,7 +29,6 @@ Test the ability to configure the $CCCOM construction variable.
 """
 
 import os
-import string
 import sys
 import TestSCons
 
diff --git a/test/CC/CCCOMSTR.py b/test/CC/CCCOMSTR.py
index 50ddb5a..bd54a15 100644
--- a/test/CC/CCCOMSTR.py
+++ b/test/CC/CCCOMSTR.py
@@ -30,7 +30,6 @@ the C compilation output.
 """
 
 import os
-import string
 import sys
 import TestSCons
 
diff --git a/test/CC/SHCCCOM.py b/test/CC/SHCCCOM.py
index 5606fd0..695ad59 100644
--- a/test/CC/SHCCCOM.py
+++ b/test/CC/SHCCCOM.py
@@ -25,7 +25,6 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os
-import string
 import sys
 import TestSCons
 
diff --git a/test/CC/SHCCCOMSTR.py b/test/CC/SHCCCOMSTR.py
index 562961a..31a46c4 100644
--- a/test/CC/SHCCCOMSTR.py
+++ b/test/CC/SHCCCOMSTR.py
@@ -30,7 +30,6 @@ the shared object C compilation output.
 """
 
 import os
-import string
 import sys
 import TestSCons
 
diff --git a/test/CFILESUFFIX.py b/test/CFILESUFFIX.py
index 08c40c2..a8c44a6 100644
--- a/test/CFILESUFFIX.py
+++ b/test/CFILESUFFIX.py
@@ -29,7 +29,6 @@ Verify that we can set CFILESUFFIX to arbitrary values.
 """
 
 import os
-import os.path
 import string
 import sys
 import TestSCons
diff --git a/test/CPPFLAGS.py b/test/CPPFLAGS.py
index 1aaf4a3..a821296 100644
--- a/test/CPPFLAGS.py
+++ b/test/CPPFLAGS.py
@@ -24,9 +24,8 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-import os
-import string
 import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/CPPSUFFIXES.py b/test/CPPSUFFIXES.py
index 305cf04..6133bdf 100644
--- a/test/CPPSUFFIXES.py
+++ b/test/CPPSUFFIXES.py
@@ -35,7 +35,6 @@ _python_ = TestSCons._python_
 test = TestSCons.TestSCons()
 
 test.write('mycc.py', r"""
-import string
 import sys
 def do_file(outf, inf):
     for line in open(inf, 'rb').readlines():
diff --git a/test/CVS.py b/test/CVS.py
index c21d9ad..510539c 100644
--- a/test/CVS.py
+++ b/test/CVS.py
@@ -29,7 +29,6 @@ Test fetching source files from CVS.
 """
 
 import os
-import os.path
 
 import TestSCons
 
diff --git a/test/CXX/CXXCOM.py b/test/CXX/CXXCOM.py
index 5fc40d0..64e4a50 100644
--- a/test/CXX/CXXCOM.py
+++ b/test/CXX/CXXCOM.py
@@ -28,8 +28,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 Test the ability to configure the $CXXCOM construction variable.
 """
 
-import os
-import string
 import sys
 import TestSCons
 
diff --git a/test/CXX/CXXCOMSTR.py b/test/CXX/CXXCOMSTR.py
index df4a87b..e738533 100644
--- a/test/CXX/CXXCOMSTR.py
+++ b/test/CXX/CXXCOMSTR.py
@@ -29,9 +29,6 @@ Test that the $CXXCOMSTR construction variable allows you to configure
 the C++ compilation output.
 """
 
-import os
-import string
-import sys
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/CXX/CXXFILESUFFIX.py b/test/CXX/CXXFILESUFFIX.py
index d2a70c3..f74ec84 100644
--- a/test/CXX/CXXFILESUFFIX.py
+++ b/test/CXX/CXXFILESUFFIX.py
@@ -25,7 +25,6 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os
-import os.path
 import string
 import sys
 import TestSCons
diff --git a/test/CXX/SHCXXCOM.py b/test/CXX/SHCXXCOM.py
index 628bc00..1a8750f 100644
--- a/test/CXX/SHCXXCOM.py
+++ b/test/CXX/SHCXXCOM.py
@@ -28,8 +28,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 Test the ability to configure the $SHCXXCOM construction variable.
 """
 
-import os
-import string
 import sys
 import TestSCons
 
diff --git a/test/CXX/SHCXXCOMSTR.py b/test/CXX/SHCXXCOMSTR.py
index dd92541..829c9e4 100644
--- a/test/CXX/SHCXXCOMSTR.py
+++ b/test/CXX/SHCXXCOMSTR.py
@@ -29,8 +29,6 @@ Test that the $SHCXXCOMSTR construction variable allows you to customize
 the shared object C++ compilation output.
 """
 
-import os
-import string
 import sys
 import TestSCons
 
diff --git a/test/CacheDir/debug.py b/test/CacheDir/debug.py
index ebf67f7..9301241 100644
--- a/test/CacheDir/debug.py
+++ b/test/CacheDir/debug.py
@@ -33,8 +33,6 @@ to build it because it doesn't exist in the CacheDir, and the time our
 build of the file completes and we push it out.
 """
 
-import os
-
 import TestSCons
 
 test = TestSCons.TestSCons(match=TestSCons.match_re)
diff --git a/test/CacheDir/symlink.py b/test/CacheDir/symlink.py
index 6dd1f94..3bc8ec1 100644
--- a/test/CacheDir/symlink.py
+++ b/test/CacheDir/symlink.py
@@ -30,7 +30,6 @@ as an actualy symlink, not by copying the file contents.
 """
 
 import os
-import os.path
 
 import TestSCons
 
diff --git a/test/CacheDir/up-to-date-q.py b/test/CacheDir/up-to-date-q.py
index 0a49164..3830cd2 100644
--- a/test/CacheDir/up-to-date-q.py
+++ b/test/CacheDir/up-to-date-q.py
@@ -59,7 +59,6 @@ int main(){ return 0; }
 """
 
 sconstruct = """
-import os
 CacheDir(r'%s')
 Program('foo', 'foo.c')
 """ % test.workpath('cache')
diff --git a/test/Chmod.py b/test/Chmod.py
index 61d21eb..b603f35 100644
--- a/test/Chmod.py
+++ b/test/Chmod.py
@@ -29,7 +29,6 @@ Verify that the Chmod() Action works.
 """
 
 import os
-import os.path
 import stat
 
 import TestSCons
diff --git a/test/Configure/ConfigureDryRunError.py b/test/Configure/ConfigureDryRunError.py
index 65c6403..2243625 100644
--- a/test/Configure/ConfigureDryRunError.py
+++ b/test/Configure/ConfigureDryRunError.py
@@ -28,7 +28,7 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 Verify the ConfigureDryRunError.
 """
 
-import os.path
+import os
 
 import TestSCons
 
diff --git a/test/Configure/VariantDir.py b/test/Configure/VariantDir.py
index 63fcb93..be2d77d 100644
--- a/test/Configure/VariantDir.py
+++ b/test/Configure/VariantDir.py
@@ -28,7 +28,7 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 Verify that Configure contexts work with basic use of VariantDir.
 """
 
-import os.path
+import os
 
 import TestSCons
 
diff --git a/test/Configure/cache-not-ok.py b/test/Configure/cache-not-ok.py
index 48524c2..7dc8773 100644
--- a/test/Configure/cache-not-ok.py
+++ b/test/Configure/cache-not-ok.py
@@ -28,8 +28,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 Verify that the cache mechanism works when checks are not ok.
 """
 
-import os.path
-
 import TestSCons
 
 _exe = TestSCons._exe
diff --git a/test/Configure/clean.py b/test/Configure/clean.py
index 3fcfcbd..a48029d 100644
--- a/test/Configure/clean.py
+++ b/test/Configure/clean.py
@@ -29,8 +29,6 @@ Verify that we don't perform Configure context actions when the
 -c or --clean options have been specified.
 """
 
-import string
-
 import TestSCons
 
 test = TestSCons.TestSCons(match = TestSCons.match_re_dotall)
diff --git a/test/Configure/help.py b/test/Configure/help.py
index 9f58513..9abdc61 100644
--- a/test/Configure/help.py
+++ b/test/Configure/help.py
@@ -29,8 +29,6 @@ Verify that we don't perform Configure context actions when the
 -H, -h or --help options have been specified.
 """
 
-import string
-
 import TestSCons
 
 test = TestSCons.TestSCons(match = TestSCons.match_re_dotall)
diff --git a/test/Copy-Action.py b/test/Copy-Action.py
index 768d102..252c458 100644
--- a/test/Copy-Action.py
+++ b/test/Copy-Action.py
@@ -30,9 +30,8 @@ times and modes.
 """
 
 import os
-import os.path
-import sys
 import stat
+import sys
 
 import TestSCons
 
diff --git a/test/D/DMD.py b/test/D/DMD.py
index 8b443f8..47f7c3b 100644
--- a/test/D/DMD.py
+++ b/test/D/DMD.py
@@ -25,8 +25,7 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os
-import string
-import sys
+
 import TestSCons
 
 _exe = TestSCons._exe
diff --git a/test/DSUFFIXES.py b/test/DSUFFIXES.py
index a344112..93e34f9 100644
--- a/test/DSUFFIXES.py
+++ b/test/DSUFFIXES.py
@@ -35,7 +35,6 @@ _python_ = TestSCons._python_
 test = TestSCons.TestSCons()
 
 test.write('mydc.py', r"""
-import string
 import sys
 def do_file(outf, inf):
     for line in open(inf, 'rb').readlines():
diff --git a/test/Deprecated/BuildDir.py b/test/Deprecated/BuildDir.py
index 709ea8b..a99d14f 100644
--- a/test/Deprecated/BuildDir.py
+++ b/test/Deprecated/BuildDir.py
@@ -32,10 +32,8 @@ under the covers).
 Note that using BuildDir() does not yet print a deprecation warning.
 """
 
-import os.path
 import string
-import sys
-import time
+
 import TestSCons
 
 _exe = TestSCons._exe
diff --git a/test/Deprecated/Options/ListOption.py b/test/Deprecated/Options/ListOption.py
index 62792b6..369a8e1 100644
--- a/test/Deprecated/Options/ListOption.py
+++ b/test/Deprecated/Options/ListOption.py
@@ -29,7 +29,6 @@ Test the ListOption canned Option type.
 """
 
 import os
-import os.path
 import string
 
 import TestSCons
diff --git a/test/Deprecated/Options/chdir.py b/test/Deprecated/Options/chdir.py
index dd4eb70..5d6d3ff 100644
--- a/test/Deprecated/Options/chdir.py
+++ b/test/Deprecated/Options/chdir.py
@@ -51,7 +51,6 @@ print "VARIABLE =", repr(env['VARIABLE'])
 
 test.write(['bin', 'opts.cfg'], """\
 import os
-import os.path
 os.chdir(os.path.split(__name__)[0])
 execfile('opts2.cfg')
 """)
diff --git a/test/Deprecated/Options/help.py b/test/Deprecated/Options/help.py
index 2ad5253..3905c77 100644
--- a/test/Deprecated/Options/help.py
+++ b/test/Deprecated/Options/help.py
@@ -30,7 +30,6 @@ Test the Options help messages.
 
 import os.path
 import re
-import string
 
 try:
     True, False
diff --git a/test/Deprecated/Options/import.py b/test/Deprecated/Options/import.py
index 9384986..5a1627b 100644
--- a/test/Deprecated/Options/import.py
+++ b/test/Deprecated/Options/import.py
@@ -52,7 +52,6 @@ print "VARIABLE =", env.get('VARIABLE')
 """
 
 test.write(['bin', 'opts.cfg'], """\
-import sys
 from local_options import VARIABLE
 """ % locals())
 
diff --git a/test/Deprecated/SourceSignatures/basic.py b/test/Deprecated/SourceSignatures/basic.py
index 5012296..2bfdd65 100644
--- a/test/Deprecated/SourceSignatures/basic.py
+++ b/test/Deprecated/SourceSignatures/basic.py
@@ -25,7 +25,6 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os
-import os.path
 import re
 
 import TestSCons
diff --git a/test/Deprecated/SourceSignatures/env.py b/test/Deprecated/SourceSignatures/env.py
index ec6d3d2..12a596f 100644
--- a/test/Deprecated/SourceSignatures/env.py
+++ b/test/Deprecated/SourceSignatures/env.py
@@ -30,7 +30,6 @@ default behavior.
 """
 
 import os
-import os.path
 import re
 
 import TestSCons
diff --git a/test/Deprecated/SourceSignatures/no-csigs.py b/test/Deprecated/SourceSignatures/no-csigs.py
index 01d05da..be9cb09 100644
--- a/test/Deprecated/SourceSignatures/no-csigs.py
+++ b/test/Deprecated/SourceSignatures/no-csigs.py
@@ -26,7 +26,6 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os
-import os.path
 
 import TestSCons
 import TestSConsign
diff --git a/test/Deprecated/debug-dtree.py b/test/Deprecated/debug-dtree.py
index 8918052..3a772d7 100644
--- a/test/Deprecated/debug-dtree.py
+++ b/test/Deprecated/debug-dtree.py
@@ -30,9 +30,6 @@ dependencies (sources or Depends()) of a target.
 """
 
 import TestSCons
-import sys
-import re
-import time
 
 test = TestSCons.TestSCons(match = TestSCons.match_re_dotall)
 
diff --git a/test/Deprecated/debug-stree.py b/test/Deprecated/debug-stree.py
index 9b6e067..714b5b3 100644
--- a/test/Deprecated/debug-stree.py
+++ b/test/Deprecated/debug-stree.py
@@ -29,11 +29,9 @@ Test that the --debug=stree option prints a dependency tree with output
 that indicates the state of various Node status flags.
 """
 
-import TestSCons
-import sys
 import string
-import re
-import time
+
+import TestSCons
 
 test = TestSCons.TestSCons(match = TestSCons.match_re_dotall)
 
diff --git a/test/Deprecated/debug-tree.py b/test/Deprecated/debug-tree.py
index 73b8ec0..833abd5 100644
--- a/test/Deprecated/debug-tree.py
+++ b/test/Deprecated/debug-tree.py
@@ -30,9 +30,6 @@ complete dependencies of a target.
 """
 
 import TestSCons
-import sys
-import re
-import time
 
 test = TestSCons.TestSCons(match = TestSCons.match_re_dotall)
 
diff --git a/test/Dir/source.py b/test/Dir/source.py
index 68165f3..c797246 100644
--- a/test/Dir/source.py
+++ b/test/Dir/source.py
@@ -31,7 +31,6 @@ In other words, if a build has a directory as a source file, any
 change in any file under that directory should trigger a rebuild.
 """
 
-import sys
 import TestSCons
 
 
diff --git a/test/Fortran/F77PATH.py b/test/Fortran/F77PATH.py
index e1973da..cc62719 100644
--- a/test/Fortran/F77PATH.py
+++ b/test/Fortran/F77PATH.py
@@ -25,7 +25,6 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os
-import string
 
 import TestSCons
 
diff --git a/test/Fortran/F90PATH.py b/test/Fortran/F90PATH.py
index c069f64..d8f73f4 100644
--- a/test/Fortran/F90PATH.py
+++ b/test/Fortran/F90PATH.py
@@ -25,7 +25,6 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os
-import string
 
 import TestSCons
 
diff --git a/test/Fortran/FORTRANPATH.py b/test/Fortran/FORTRANPATH.py
index 465b5c7..bf99b5b 100644
--- a/test/Fortran/FORTRANPATH.py
+++ b/test/Fortran/FORTRANPATH.py
@@ -25,7 +25,6 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os
-import string
 
 import TestSCons
 
diff --git a/test/Fortran/FORTRANSUFFIXES.py b/test/Fortran/FORTRANSUFFIXES.py
index 3011fac..353405b 100644
--- a/test/Fortran/FORTRANSUFFIXES.py
+++ b/test/Fortran/FORTRANSUFFIXES.py
@@ -35,7 +35,6 @@ _python_ = TestSCons._python_
 test = TestSCons.TestSCons()
 
 test.write('myfc.py', r"""
-import string
 import sys
 def do_file(outf, inf):
     for line in open(inf, 'rb').readlines():
diff --git a/test/Ghostscript/GS.py b/test/Ghostscript/GS.py
index 6089d60..ab25369 100644
--- a/test/Ghostscript/GS.py
+++ b/test/Ghostscript/GS.py
@@ -25,9 +25,9 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os
-import os.path
 import string
 import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/Ghostscript/GSFLAGS.py b/test/Ghostscript/GSFLAGS.py
index 7acb89e..eab925d 100644
--- a/test/Ghostscript/GSFLAGS.py
+++ b/test/Ghostscript/GSFLAGS.py
@@ -25,9 +25,9 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os
-import os.path
 import string
 import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/Glob/glob-libpath.py b/test/Glob/glob-libpath.py
index fb16fca..1effcc1 100644
--- a/test/Glob/glob-libpath.py
+++ b/test/Glob/glob-libpath.py
@@ -30,7 +30,6 @@ See bug #2184, "Glob pollutes LIBPATH" from Ian P. Cardenas.
 Test output should not contain -Lsrc/util.
 """
 
-import TestCmd
 import TestSCons
 
 test = TestSCons.TestSCons()
diff --git a/test/IDL/midl.py b/test/IDL/midl.py
index 88e0517..ac9597c 100644
--- a/test/IDL/midl.py
+++ b/test/IDL/midl.py
@@ -26,10 +26,8 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import TestSCons
 import sys
-import os.path
 import os
 import TestCmd
-import time
 
 test = TestSCons.TestSCons(match = TestCmd.match_re)
 
diff --git a/test/Install/Install.py b/test/Install/Install.py
index c38edaa..8c52015 100644
--- a/test/Install/Install.py
+++ b/test/Install/Install.py
@@ -30,8 +30,8 @@ Verify that the Install() Builder works
 
 import os.path
 import string
-import sys
 import time
+
 import TestSCons
 
 test = TestSCons.TestSCons()
diff --git a/test/Install/InstallAs.py b/test/Install/InstallAs.py
index 8b279f1..ba83259 100644
--- a/test/Install/InstallAs.py
+++ b/test/Install/InstallAs.py
@@ -29,7 +29,7 @@ Test the InstallAs() Environment method.
 """
 
 import os.path
-import sys
+
 import TestSCons
 
 test = TestSCons.TestSCons()
diff --git a/test/Install/directories.py b/test/Install/directories.py
index 3005859..5a795af 100644
--- a/test/Install/directories.py
+++ b/test/Install/directories.py
@@ -29,9 +29,7 @@ Test using Install() on directories.
 """
 
 import os.path
-import string
-import sys
-import time
+
 import TestSCons
 
 test = TestSCons.TestSCons()
diff --git a/test/Install/option--install-sandbox.py b/test/Install/option--install-sandbox.py
index 3ec5b3b..32e61a1 100644
--- a/test/Install/option--install-sandbox.py
+++ b/test/Install/option--install-sandbox.py
@@ -29,7 +29,7 @@ Test the --install-sandbox commandline option for Install() and InstallAs().
 """
 
 import os.path
-import sys
+
 import TestSCons
 
 test = TestSCons.TestSCons()
diff --git a/test/Interactive/added-include.py b/test/Interactive/added-include.py
index 73f8096..ca7c92f 100644
--- a/test/Interactive/added-include.py
+++ b/test/Interactive/added-include.py
@@ -30,8 +30,6 @@ rebuild a target when an implicit dependency (include line) is
 added to the source file.
 """
 
-import string
-
 import TestSCons
 
 test = TestSCons.TestSCons()
diff --git a/test/Java/JAR.py b/test/Java/JAR.py
index ee552f4..34657ff 100644
--- a/test/Java/JAR.py
+++ b/test/Java/JAR.py
@@ -25,7 +25,6 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os
-import os.path
 import string
 import sys
 import TestSCons
diff --git a/test/Java/JAVAC.py b/test/Java/JAVAC.py
index 09639ea..baedac0 100644
--- a/test/Java/JAVAC.py
+++ b/test/Java/JAVAC.py
@@ -29,9 +29,8 @@ Test setting the JAVAC variable.
 """
 
 import os
-import os.path
-import string
 import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/Java/JAVAH.py b/test/Java/JAVAH.py
index 95abd33..32ad119 100644
--- a/test/Java/JAVAH.py
+++ b/test/Java/JAVAH.py
@@ -24,7 +24,7 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-import os.path
+import os
 import string
 
 import TestSCons
diff --git a/test/Java/Java-1.4.py b/test/Java/Java-1.4.py
index 3c0e1ed..0906513 100644
--- a/test/Java/Java-1.4.py
+++ b/test/Java/Java-1.4.py
@@ -29,9 +29,8 @@ Test Java compilation with a live Java 1.4 "javac" compiler.
 """
 
 import os
-import os.path
-import string
 import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/Java/Java-1.5.py b/test/Java/Java-1.5.py
index f6d93c7..20ebc25 100644
--- a/test/Java/Java-1.5.py
+++ b/test/Java/Java-1.5.py
@@ -29,9 +29,8 @@ Test Java compilation with a live Java 1.5 "javac" compiler.
 """
 
 import os
-import os.path
-import string
 import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/Java/Java-1.6.py b/test/Java/Java-1.6.py
index 5bd8e2f..649cf01 100644
--- a/test/Java/Java-1.6.py
+++ b/test/Java/Java-1.6.py
@@ -29,9 +29,8 @@ Test Java compilation with a live Java 1.6 "javac" compiler.
 """
 
 import os
-import os.path
-import string
 import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/Java/RMIC.py b/test/Java/RMIC.py
index f9721c2..3340707 100644
--- a/test/Java/RMIC.py
+++ b/test/Java/RMIC.py
@@ -27,6 +27,7 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 import os
 import string
 import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_
@@ -34,7 +35,7 @@ _python_ = TestSCons._python_
 test = TestSCons.TestSCons()
 
 test.write('myrmic.py', r"""
-import os.path
+import os
 import sys
 args = sys.argv[1:]
 while args:
diff --git a/test/Java/multi-step.py b/test/Java/multi-step.py
index b5f24f9..34e814b 100644
--- a/test/Java/multi-step.py
+++ b/test/Java/multi-step.py
@@ -29,6 +29,8 @@ Real-world test (courtesy Leanid Nazdrynau) of the multi-step
 capabilities of the various Java Builders.
 """
 
+import os
+
 import TestSCons
 
 test = TestSCons.TestSCons()
@@ -562,7 +564,6 @@ test.must_exist(['buildout', 'jni', 'SampleTest.java'])
 # a SampleTest.class file, while others do.  Only issue a warning if
 # it doesn't exist.
 p = test.workpath('buildout', 'jni', 'SampleTest.class')
-import os.path
 if not os.path.exists(p):
     print 'Warning:  %s does not exist' % p
 
diff --git a/test/Java/nested-classes.py b/test/Java/nested-classes.py
index 3d3e990..3550e76 100644
--- a/test/Java/nested-classes.py
+++ b/test/Java/nested-classes.py
@@ -29,9 +29,7 @@ Test Java compilation with inner and anonymous classes (Issue 2087).
 """
 
 import os
-import os.path
-import string
-import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/LEX/LEX.py b/test/LEX/LEX.py
index 91b4614..94692db 100644
--- a/test/LEX/LEX.py
+++ b/test/LEX/LEX.py
@@ -25,7 +25,6 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os
-import os.path
 import string
 import sys
 import TestSCons
diff --git a/test/LEX/LEXFLAGS.py b/test/LEX/LEXFLAGS.py
index e72fa9e..1555142 100644
--- a/test/LEX/LEXFLAGS.py
+++ b/test/LEX/LEXFLAGS.py
@@ -25,7 +25,6 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os
-import os.path
 import string
 import sys
 import TestSCons
diff --git a/test/LINK/LINKCOM.py b/test/LINK/LINKCOM.py
index d914049..db8a221 100644
--- a/test/LINK/LINKCOM.py
+++ b/test/LINK/LINKCOM.py
@@ -28,9 +28,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 Test the ability to configure the $LINKCOM construction variable.
 """
 
-import os
-import string
-import sys
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/LINK/LINKCOMSTR.py b/test/LINK/LINKCOMSTR.py
index 1a7efbe..9eb4027 100644
--- a/test/LINK/LINKCOMSTR.py
+++ b/test/LINK/LINKCOMSTR.py
@@ -29,7 +29,6 @@ Test that the $LINKCOMSTR construction variable allows you to customize
 the displayed linker string.
 """
 
-import os
 import string
 import sys
 import TestSCons
diff --git a/test/LINK/SHLINKCOM.py b/test/LINK/SHLINKCOM.py
index 2d2f718..667564e 100644
--- a/test/LINK/SHLINKCOM.py
+++ b/test/LINK/SHLINKCOM.py
@@ -28,8 +28,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 Test the ability to configure the $SHLINKCOM construction variable.
 """
 
-import os
-import string
 import sys
 import TestSCons
 
diff --git a/test/LINK/SHLINKCOMSTR.py b/test/LINK/SHLINKCOMSTR.py
index 94740b8..a3dc2cf 100644
--- a/test/LINK/SHLINKCOMSTR.py
+++ b/test/LINK/SHLINKCOMSTR.py
@@ -29,9 +29,6 @@ Test that the $SHLINKCOMSTR construction variable allows you to customize
 the displayed linker string for programs using shared libraries.
 """
 
-import os
-import string
-import sys
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/Libs/LIBPATH.py b/test/Libs/LIBPATH.py
index 7fd4f9b..e52cb9f 100644
--- a/test/Libs/LIBPATH.py
+++ b/test/Libs/LIBPATH.py
@@ -24,11 +24,11 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-import TestSCons
-import sys
 import os.path
 import time
 
+import TestSCons
+
 _exe = TestSCons._exe
 _dll = TestSCons._dll
 dll_ = TestSCons.dll_
diff --git a/test/Libs/SHLIBPREFIX.py b/test/Libs/SHLIBPREFIX.py
index 87b92fa..2af6a96 100644
--- a/test/Libs/SHLIBPREFIX.py
+++ b/test/Libs/SHLIBPREFIX.py
@@ -25,7 +25,7 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os
-import sys
+
 import TestSCons
 
 _lib = TestSCons._dll
diff --git a/test/Libs/SHLIBSUFFIX.py b/test/Libs/SHLIBSUFFIX.py
index dc88e3b..e2509fa 100644
--- a/test/Libs/SHLIBSUFFIX.py
+++ b/test/Libs/SHLIBSUFFIX.py
@@ -25,7 +25,7 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os
-import sys
+
 import TestSCons
 
 dll_ = TestSCons.dll_
diff --git a/test/Libs/SharedLibrary.py b/test/Libs/SharedLibrary.py
index 554f8df..b688a0b 100644
--- a/test/Libs/SharedLibrary.py
+++ b/test/Libs/SharedLibrary.py
@@ -28,7 +28,6 @@ import os
 import string
 import sys
 
-import TestCmd
 import TestSCons
 
 test = TestSCons.TestSCons()
diff --git a/test/M4/M4.py b/test/M4/M4.py
index 859c57b..d7d87bd 100644
--- a/test/M4/M4.py
+++ b/test/M4/M4.py
@@ -29,7 +29,6 @@ Test that $M4 and $M4FLAGS work as expected.
 """
 
 import os
-import os.path
 import string
 import sys
 import TestSCons
diff --git a/test/MSVC/PCHSTOP-errors.py b/test/MSVC/PCHSTOP-errors.py
index c0bc693..8c5bb14 100644
--- a/test/MSVC/PCHSTOP-errors.py
+++ b/test/MSVC/PCHSTOP-errors.py
@@ -1,75 +1,75 @@
-#!/usr/bin/env python

-#

-# __COPYRIGHT__

-#

-# Permission is hereby granted, free of charge, to any person obtaining

-# a copy of this software and associated documentation files (the

-# "Software"), to deal in the Software without restriction, including

-# without limitation the rights to use, copy, modify, merge, publish,

-# distribute, sublicense, and/or sell copies of the Software, and to

-# permit persons to whom the Software is furnished to do so, subject to

-# the following conditions:

-#

-# The above copyright notice and this permission notice shall be included

-# in all copies or substantial portions of the Software.

-#

-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY

-# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE

-# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE

-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION

-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION

-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

-#

-

-__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"

-

-"""

-# Test error reporting

-"""

-

-import re

-import sys

-

-import TestSCons

-

-test = TestSCons.TestSCons(match = TestSCons.match_re)

-

-if sys.platform != 'win32':

-    msg = "Skipping Visual C/C++ test on non-Windows platform '%s'\n" % sys.platform

-    test.skip_test(msg)

-

-

-

-SConstruct_path = test.workpath('SConstruct')

-

-test.write(SConstruct_path, """\

-env = Environment()

-env['PDB'] = File('test.pdb')

-env['PCH'] = env.PCH('StdAfx.cpp')[0]

-if int(ARGUMENTS.get('SET_PCHSTOP')):

-    env['PCHSTOP'] = File('StdAfx.h')

-env.Program('test', 'test.cpp')

-""")

-

-

-

-expect_stderr = r'''

-scons: \*\*\* The PCHSTOP construction must be defined if PCH is defined.

-File "%s", line \d+, in \?

-''' % re.escape(SConstruct_path)

-

-test.run(arguments='SET_PCHSTOP=0', status=2, stderr=expect_stderr)

-

-

-

-expect_stderr = r'''

-scons: \*\*\* The PCHSTOP construction variable must be a string: .+

-File "%s", line \d+, in \?

-''' % re.escape(SConstruct_path)

-

-test.run(arguments='SET_PCHSTOP=1', status=2, stderr=expect_stderr)

-

-

-

-test.pass_test()

+#!/usr/bin/env python
+#
+# __COPYRIGHT__
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
+
+"""
+# Test error reporting
+"""
+
+import re
+import sys
+
+import TestSCons
+
+test = TestSCons.TestSCons(match = TestSCons.match_re)
+
+if sys.platform != 'win32':
+    msg = "Skipping Visual C/C++ test on non-Windows platform '%s'\n" % sys.platform
+    test.skip_test(msg)
+
+
+
+SConstruct_path = test.workpath('SConstruct')
+
+test.write(SConstruct_path, """\
+env = Environment()
+env['PDB'] = File('test.pdb')
+env['PCH'] = env.PCH('StdAfx.cpp')[0]
+if int(ARGUMENTS.get('SET_PCHSTOP')):
+    env['PCHSTOP'] = File('StdAfx.h')
+env.Program('test', 'test.cpp')
+""")
+
+
+
+expect_stderr = r'''
+scons: \*\*\* The PCHSTOP construction must be defined if PCH is defined.
+File "%s", line \d+, in \?
+''' % re.escape(SConstruct_path)
+
+test.run(arguments='SET_PCHSTOP=0', status=2, stderr=expect_stderr)
+
+
+
+expect_stderr = r'''
+scons: \*\*\* The PCHSTOP construction variable must be a string: .+
+File "%s", line \d+, in \?
+''' % re.escape(SConstruct_path)
+
+test.run(arguments='SET_PCHSTOP=1', status=2, stderr=expect_stderr)
+
+
+
+test.pass_test()
diff --git a/test/MSVC/msvc.py b/test/MSVC/msvc.py
index c2a2d0e..fe464c4 100644
--- a/test/MSVC/msvc.py
+++ b/test/MSVC/msvc.py
@@ -25,7 +25,6 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os
-import re
 import sys
 import time
 
diff --git a/test/MSVS/common-prefix.py b/test/MSVS/common-prefix.py
index 5a49a8c..66a8a8b 100644
--- a/test/MSVS/common-prefix.py
+++ b/test/MSVS/common-prefix.py
@@ -31,10 +31,8 @@ solution (.sln) files that look correct.
 """
 
 import os
-import os.path
 import sys
 
-import TestCmd
 import TestSConsMSVS
 
 test = TestSConsMSVS.TestSConsMSVS()
diff --git a/test/MSVS/runfile.py b/test/MSVS/runfile.py
index c775bdc..3edd711 100644
--- a/test/MSVS/runfile.py
+++ b/test/MSVS/runfile.py
@@ -31,10 +31,8 @@ solution (.sln) files that look correct.
 """
 
 import os
-import os.path
 import sys
 
-import TestCmd
 import TestSConsMSVS
 
 test = TestSConsMSVS.TestSConsMSVS()
diff --git a/test/Parallel/failed-build.py b/test/Parallel/failed-build.py
index 64e90c9..7056db1 100644
--- a/test/Parallel/failed-build.py
+++ b/test/Parallel/failed-build.py
@@ -62,7 +62,7 @@ test = TestSCons.TestSCons()
 # it sees the failure from the first script.
 
 test.write('myfail.py', r"""\
-import os.path
+import os
 import sys
 import time
 while not os.path.exists('mycopy.started'):
diff --git a/test/ParseConfig.py b/test/ParseConfig.py
index ed22276..8ba166f 100644
--- a/test/ParseConfig.py
+++ b/test/ParseConfig.py
@@ -24,10 +24,6 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-import os
-import sys
-
-import TestCmd
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/PharLap.py b/test/PharLap.py
index c8353f4..991ac0b 100644
--- a/test/PharLap.py
+++ b/test/PharLap.py
@@ -25,12 +25,11 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os
-import os.path
-import string
 import sys
-import TestSCons
 import time
 
+import TestSCons
+
 test = TestSCons.TestSCons()
 
 if sys.platform != 'win32':
diff --git a/test/Program-j.py b/test/Program-j.py
index d8180bb..62bbf3c 100644
--- a/test/Program-j.py
+++ b/test/Program-j.py
@@ -24,7 +24,6 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-import sys
 import TestSCons
 
 _exe = TestSCons._exe
diff --git a/test/Program.py b/test/Program.py
index cf98148..a54d7c1 100644
--- a/test/Program.py
+++ b/test/Program.py
@@ -25,8 +25,8 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os.path
-import sys
 import time
+
 import TestSCons
 
 _exe = TestSCons._exe
diff --git a/test/QT/Tool.py b/test/QT/Tool.py
index 6c4a2eb..bb6b851 100644
--- a/test/QT/Tool.py
+++ b/test/QT/Tool.py
@@ -46,7 +46,6 @@ if not os.environ.get('QTDIR', None):
 
 test.write('SConstruct', """
 import os
-import os.path
 
 def DoWithVariables(variables, prefix, what):
   saved_variables = { }
diff --git a/test/QT/installed.py b/test/QT/installed.py
index 25e8b91..dde81c7 100644
--- a/test/QT/installed.py
+++ b/test/QT/installed.py
@@ -29,7 +29,6 @@ Look if qt is installed, and try out all builders.
 """
 
 import os
-import re
 import string
 import sys
 
diff --git a/test/QT/up-to-date.py b/test/QT/up-to-date.py
index b6ebfdf..28ae16e 100644
--- a/test/QT/up-to-date.py
+++ b/test/QT/up-to-date.py
@@ -52,7 +52,6 @@ test.subdir('layer',
 
 test.write('SConstruct', """\
 import os
-import sys
 aa=os.getcwd()
 
 env=Environment(tools=['default','expheaders','qt'],toolpath=[aa])
diff --git a/test/RANLIB/RANLIB.py b/test/RANLIB/RANLIB.py
index 75e860a..3cf9c05 100644
--- a/test/RANLIB/RANLIB.py
+++ b/test/RANLIB/RANLIB.py
@@ -25,7 +25,6 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os
-import os.path
 import string
 import sys
 import TestSCons
diff --git a/test/RCS/changed.py b/test/RCS/changed.py
index 6aaeffb..9a918db 100644
--- a/test/RCS/changed.py
+++ b/test/RCS/changed.py
@@ -28,8 +28,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 Test explicit checkouts from local RCS files.
 """
 
-import os.path
-
 import TestSCons
 
 test = TestSCons.TestSCons()
diff --git a/test/RCS/diskcheck.py b/test/RCS/diskcheck.py
index 99ba7ed..b6b1070 100644
--- a/test/RCS/diskcheck.py
+++ b/test/RCS/diskcheck.py
@@ -28,7 +28,7 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 Test transparent RCS checkouts from an RCS subdirectory.
 """
 
-import os.path
+import os
 
 import TestSCons
 
diff --git a/test/RCS/explicit.py b/test/RCS/explicit.py
index d3d5d87..46ed8b6 100644
--- a/test/RCS/explicit.py
+++ b/test/RCS/explicit.py
@@ -28,7 +28,7 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 Test explicit checkouts from local RCS files.
 """
 
-import os.path
+import os
 
 import TestSCons
 
diff --git a/test/RCS/transparent.py b/test/RCS/transparent.py
index 28dc558..1aceb46 100644
--- a/test/RCS/transparent.py
+++ b/test/RCS/transparent.py
@@ -28,7 +28,7 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 Test transparent RCS checkouts from an RCS subdirectory.
 """
 
-import os.path
+import os
 
 import TestSCons
 
diff --git a/test/Repository/Default.py b/test/Repository/Default.py
index ff5a504..82751c3 100644
--- a/test/Repository/Default.py
+++ b/test/Repository/Default.py
@@ -25,7 +25,7 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os.path
-import sys
+
 import TestSCons
 
 test = TestSCons.TestSCons()
diff --git a/test/Repository/Install.py b/test/Repository/Install.py
index 4df9c24..d0038e3 100644
--- a/test/Repository/Install.py
+++ b/test/Repository/Install.py
@@ -25,7 +25,7 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os.path
-import sys
+
 import TestSCons
 
 test = TestSCons.TestSCons()
diff --git a/test/Repository/InstallAs.py b/test/Repository/InstallAs.py
index 749c745..28b9421 100644
--- a/test/Repository/InstallAs.py
+++ b/test/Repository/InstallAs.py
@@ -25,7 +25,7 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os.path
-import sys
+
 import TestSCons
 
 test = TestSCons.TestSCons()
diff --git a/test/Repository/Java.py b/test/Repository/Java.py
index e964456..2c5e30d 100644
--- a/test/Repository/Java.py
+++ b/test/Repository/Java.py
@@ -29,8 +29,7 @@ Test building Java applications when using Repositories.
 """
 
 import os
-import string
-import sys
+
 import TestSCons
 
 python = TestSCons.python
diff --git a/test/Repository/JavaH.py b/test/Repository/JavaH.py
index 258d9bd..9128b6d 100644
--- a/test/Repository/JavaH.py
+++ b/test/Repository/JavaH.py
@@ -29,8 +29,7 @@ Test building Java applications when using Repositories.
 """
 
 import os
-import string
-import sys
+
 import TestSCons
 
 python = TestSCons.python
diff --git a/test/Repository/Local.py b/test/Repository/Local.py
index b7f4e33..a099e40 100644
--- a/test/Repository/Local.py
+++ b/test/Repository/Local.py
@@ -25,7 +25,7 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os.path
-import sys
+
 import TestSCons
 
 test = TestSCons.TestSCons()
diff --git a/test/Repository/M4.py b/test/Repository/M4.py
index 3178fbb..09c3861 100644
--- a/test/Repository/M4.py
+++ b/test/Repository/M4.py
@@ -29,7 +29,6 @@ Test that $M4 and $M4FLAGS work with repositories.
 """
 
 import os
-import os.path
 import string
 import sys
 import TestSCons
diff --git a/test/Repository/SharedLibrary.py b/test/Repository/SharedLibrary.py
index 697e6ae..6b65def 100644
--- a/test/Repository/SharedLibrary.py
+++ b/test/Repository/SharedLibrary.py
@@ -33,7 +33,6 @@ import os
 import string
 import sys
 
-import TestCmd
 import TestSCons
 
 test = TestSCons.TestSCons()
diff --git a/test/Repository/VariantDir.py b/test/Repository/VariantDir.py
index 2766c80..ea11404 100644
--- a/test/Repository/VariantDir.py
+++ b/test/Repository/VariantDir.py
@@ -25,7 +25,7 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os.path
-import sys
+
 import TestSCons
 
 test = TestSCons.TestSCons()
diff --git a/test/Repository/no-repository.py b/test/Repository/no-repository.py
index f9b245e..a8ec7ca 100644
--- a/test/Repository/no-repository.py
+++ b/test/Repository/no-repository.py
@@ -24,9 +24,8 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-import os
-import string
 import sys
+
 import TestSCons
 
 python = TestSCons.python
diff --git a/test/Repository/option-c.py b/test/Repository/option-c.py
index 7013cab..1d440eb 100644
--- a/test/Repository/option-c.py
+++ b/test/Repository/option-c.py
@@ -25,7 +25,7 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os.path
-import sys
+
 import TestSCons
 
 test = TestSCons.TestSCons()
diff --git a/test/Repository/option-n.py b/test/Repository/option-n.py
index 10016a0..c6793fc 100644
--- a/test/Repository/option-n.py
+++ b/test/Repository/option-n.py
@@ -30,7 +30,7 @@ local copy of a file specified as Local() in the SConstruct.
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os.path
-import sys
+
 import TestSCons
 
 test = TestSCons.TestSCons()
diff --git a/test/Repository/signature-order.py b/test/Repository/signature-order.py
index 99bc56a..fd36182 100644
--- a/test/Repository/signature-order.py
+++ b/test/Repository/signature-order.py
@@ -30,7 +30,6 @@ signatures changes because an included file shifts from the local sandbox
 to a Repository and vice versa.
 """
 
-import sys
 import TestSCons
 
 _exe = TestSCons._exe
diff --git a/test/Rpcgen/RPCGENCLIENTFLAGS.py b/test/Rpcgen/RPCGENCLIENTFLAGS.py
index 66ea6df..5bf14ce 100644
--- a/test/Rpcgen/RPCGENCLIENTFLAGS.py
+++ b/test/Rpcgen/RPCGENCLIENTFLAGS.py
@@ -24,9 +24,9 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-import os
 import string
 import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/Rpcgen/RPCGENFLAGS.py b/test/Rpcgen/RPCGENFLAGS.py
index 8f6cfff..f18dba2 100644
--- a/test/Rpcgen/RPCGENFLAGS.py
+++ b/test/Rpcgen/RPCGENFLAGS.py
@@ -24,9 +24,9 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-import os
 import string
 import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/Rpcgen/RPCGENHEADERFLAGS.py b/test/Rpcgen/RPCGENHEADERFLAGS.py
index 411838d..c1eac5a 100644
--- a/test/Rpcgen/RPCGENHEADERFLAGS.py
+++ b/test/Rpcgen/RPCGENHEADERFLAGS.py
@@ -24,9 +24,9 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-import os
 import string
 import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/Rpcgen/RPCGENSERVICEFLAGS.py b/test/Rpcgen/RPCGENSERVICEFLAGS.py
index af638ce..bf88a24 100644
--- a/test/Rpcgen/RPCGENSERVICEFLAGS.py
+++ b/test/Rpcgen/RPCGENSERVICEFLAGS.py
@@ -24,9 +24,9 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-import os
 import string
 import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/Rpcgen/RPCGENXDRFLAGS.py b/test/Rpcgen/RPCGENXDRFLAGS.py
index 6ce0609..85ec6dc 100644
--- a/test/Rpcgen/RPCGENXDRFLAGS.py
+++ b/test/Rpcgen/RPCGENXDRFLAGS.py
@@ -24,9 +24,9 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-import os
 import string
 import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/SCONS_LIB_DIR.py b/test/SCONS_LIB_DIR.py
index 553da1d..e784e2b 100644
--- a/test/SCONS_LIB_DIR.py
+++ b/test/SCONS_LIB_DIR.py
@@ -26,7 +26,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import TestSCons
 import os
-import string
 
 test = TestSCons.TestSCons()
 
diff --git a/test/SConscript/SConscriptChdir.py b/test/SConscript/SConscriptChdir.py
index 3763378..348f87e 100644
--- a/test/SConscript/SConscriptChdir.py
+++ b/test/SConscript/SConscriptChdir.py
@@ -24,7 +24,6 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-import sys
 import TestSCons
 
 test = TestSCons.TestSCons()
diff --git a/test/SConscriptChdir.py b/test/SConscriptChdir.py
index 3763378..348f87e 100644
--- a/test/SConscriptChdir.py
+++ b/test/SConscriptChdir.py
@@ -24,7 +24,6 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-import sys
 import TestSCons
 
 test = TestSCons.TestSCons()
diff --git a/test/SWIG/SWIGFLAGS.py b/test/SWIG/SWIGFLAGS.py
index 22c311b..27fa5e3 100644
--- a/test/SWIG/SWIGFLAGS.py
+++ b/test/SWIG/SWIGFLAGS.py
@@ -28,8 +28,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 Verify that we can use ${SOURCE} expansions in $SWIGFLAGS.
 """
 
-import sys
-
 import TestSCons
 
 test = TestSCons.TestSCons()
diff --git a/test/SWIG/SWIGOUTDIR.py b/test/SWIG/SWIGOUTDIR.py
index a875e80..dedc03c 100644
--- a/test/SWIG/SWIGOUTDIR.py
+++ b/test/SWIG/SWIGOUTDIR.py
@@ -29,8 +29,6 @@ Verify that use of the $SWIGOUTDIR variable causes SCons to recognize
 that Java files are created in the specified output directory.
 """
 
-import sys
-
 import TestSCons
 
 test = TestSCons.TestSCons()
diff --git a/test/SWIG/implicit-dependencies.py b/test/SWIG/implicit-dependencies.py
index 9b3eb8e..99aa59c 100644
--- a/test/SWIG/implicit-dependencies.py
+++ b/test/SWIG/implicit-dependencies.py
@@ -28,8 +28,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 Verify that SWIG implicit dependencies are caught.
 """
 
-import sys
-
 import TestSCons
 
 test = TestSCons.TestSCons()
diff --git a/test/Scanner/exception.py b/test/Scanner/exception.py
index 31e571d..ceaca14 100644
--- a/test/Scanner/exception.py
+++ b/test/Scanner/exception.py
@@ -24,8 +24,6 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-import string
-import sys
 import TestSCons
 
 python = TestSCons.python
diff --git a/test/Scanner/generated.py b/test/Scanner/generated.py
index 507a3d3..df7f20a 100644
--- a/test/Scanner/generated.py
+++ b/test/Scanner/generated.py
@@ -34,10 +34,8 @@ factors triggered the bug Scott saw, and partly because the real-world
 complexity is valuable in its own right.
 """
 
-import os.path
 import sys
 
-import TestCmd
 import TestSCons
 
 test = TestSCons.TestSCons()
diff --git a/test/SideEffect/basic.py b/test/SideEffect/basic.py
index b01020b..f075430 100644
--- a/test/SideEffect/basic.py
+++ b/test/SideEffect/basic.py
@@ -30,7 +30,6 @@ file" as the side effect "target."
 """
 
 import os.path
-import string
 
 import TestSCons
 
diff --git a/test/SideEffect/directory.py b/test/SideEffect/directory.py
index 5ede853..ec4f261 100644
--- a/test/SideEffect/directory.py
+++ b/test/SideEffect/directory.py
@@ -28,9 +28,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 Verify that a directory (Dir()) works as a SideEffect() "target."
 """
 
-import os.path
-import string
-
 import TestSCons
 
 test = TestSCons.TestSCons()
diff --git a/test/SourceCode.py b/test/SourceCode.py
index b74f8b1..2c01158 100644
--- a/test/SourceCode.py
+++ b/test/SourceCode.py
@@ -29,7 +29,6 @@ Test fetching source files using the SourceCode() method.
 """
 
 import os
-import stat
 
 import TestSCons
 
@@ -38,7 +37,7 @@ test = TestSCons.TestSCons()
 test.subdir('sub', 'sub2')
 
 test.write('SConstruct', """\
-import os.path
+import os
 
 def cat(env, source, target):
     target = str(target[0])
diff --git a/test/TAR/TAR.py b/test/TAR/TAR.py
index c82e227..8a9a197 100644
--- a/test/TAR/TAR.py
+++ b/test/TAR/TAR.py
@@ -25,7 +25,6 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os
-import os.path
 import string
 import sys
 import TestSCons
diff --git a/test/TAR/TARCOM.py b/test/TAR/TARCOM.py
index a39dd22..a7313b3 100644
--- a/test/TAR/TARCOM.py
+++ b/test/TAR/TARCOM.py
@@ -28,9 +28,8 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 Test the ability to configure the $TARCOM construction variable.
 """
 
-import os
-import string
 import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/TAR/TARFLAGS.py b/test/TAR/TARFLAGS.py
index c592fe0..f2973b4 100644
--- a/test/TAR/TARFLAGS.py
+++ b/test/TAR/TARFLAGS.py
@@ -25,7 +25,6 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os
-import os.path
 import string
 import sys
 import TestSCons
diff --git a/test/TEX/LATEX.py b/test/TEX/LATEX.py
index d80636f..704443a 100644
--- a/test/TEX/LATEX.py
+++ b/test/TEX/LATEX.py
@@ -31,7 +31,6 @@ and that we can use this to wrap calls to the real latex utility.
 """
 
 import os
-import os.path
 import string
 import sys
 import TestSCons
diff --git a/test/TEX/LATEX2.py b/test/TEX/LATEX2.py
index 8ef7321..b67c2b1 100644
--- a/test/TEX/LATEX2.py
+++ b/test/TEX/LATEX2.py
@@ -29,9 +29,7 @@ Validate that we can produce several .pdf at once from several sources.
 """
 
 import os
-import os.path
-import string
-import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/TEX/LATEXCOM.py b/test/TEX/LATEXCOM.py
index a5044ae..dee78e9 100644
--- a/test/TEX/LATEXCOM.py
+++ b/test/TEX/LATEXCOM.py
@@ -28,9 +28,8 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 Test the ability to configure the $LATEXCOM construction variable.
 """
 
-import os
-import string
 import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/TEX/LATEXCOMSTR.py b/test/TEX/LATEXCOMSTR.py
index 08fcccb..043bab5 100644
--- a/test/TEX/LATEXCOMSTR.py
+++ b/test/TEX/LATEXCOMSTR.py
@@ -29,9 +29,8 @@ Test that the $LATEXCOMSTR construction variable allows you to configure
 the C compilation output.
 """
 
-import os
-import string
 import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/TEX/LATEXFLAGS.py b/test/TEX/LATEXFLAGS.py
index 6df1daf..568d2a8 100644
--- a/test/TEX/LATEXFLAGS.py
+++ b/test/TEX/LATEXFLAGS.py
@@ -25,7 +25,6 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os
-import os.path
 import string
 import sys
 import TestSCons
diff --git a/test/TEX/PDFLATEX.py b/test/TEX/PDFLATEX.py
index 11ada7b..af8031a 100644
--- a/test/TEX/PDFLATEX.py
+++ b/test/TEX/PDFLATEX.py
@@ -31,7 +31,6 @@ and that we can use this to wrap calls to the real latex utility.
 """
 
 import os
-import os.path
 import string
 import sys
 import TestSCons
diff --git a/test/TEX/PDFLATEXCOM.py b/test/TEX/PDFLATEXCOM.py
index 1ce2642..1887fb0 100644
--- a/test/TEX/PDFLATEXCOM.py
+++ b/test/TEX/PDFLATEXCOM.py
@@ -28,9 +28,8 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 Test the ability to configure the $PDFLATEXCOM construction variable.
 """
 
-import os
-import string
 import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/TEX/PDFLATEXCOMSTR.py b/test/TEX/PDFLATEXCOMSTR.py
index 284a52a..6b08d08 100644
--- a/test/TEX/PDFLATEXCOMSTR.py
+++ b/test/TEX/PDFLATEXCOMSTR.py
@@ -30,9 +30,8 @@ Test that the $PDFLATEXCOMSTR construction variable allows you to configure
 the C compilation output.
 """
 
-import os
-import string
 import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/TEX/PDFLATEXFLAGS.py b/test/TEX/PDFLATEXFLAGS.py
index 0ab76a1..07a1d54 100644
--- a/test/TEX/PDFLATEXFLAGS.py
+++ b/test/TEX/PDFLATEXFLAGS.py
@@ -25,7 +25,6 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os
-import os.path
 import string
 import sys
 import TestSCons
diff --git a/test/TEX/PDFTEX.py b/test/TEX/PDFTEX.py
index cde6015..b3951f9 100644
--- a/test/TEX/PDFTEX.py
+++ b/test/TEX/PDFTEX.py
@@ -31,7 +31,6 @@ and that we can use this to wrap calls to the real latex utility.
 """
 
 import os
-import os.path
 import string
 import sys
 import TestSCons
diff --git a/test/TEX/PDFTEXCOM.py b/test/TEX/PDFTEXCOM.py
index f760125..6c4b6ae 100644
--- a/test/TEX/PDFTEXCOM.py
+++ b/test/TEX/PDFTEXCOM.py
@@ -28,9 +28,8 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 Test the ability to configure the $PDFTEXCOM construction variable.
 """
 
-import os
-import string
 import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/TEX/PDFTEXCOMSTR.py b/test/TEX/PDFTEXCOMSTR.py
index ac32ae1..1332b64 100644
--- a/test/TEX/PDFTEXCOMSTR.py
+++ b/test/TEX/PDFTEXCOMSTR.py
@@ -30,9 +30,8 @@ Test that the $PDFTEXCOMSTR construction variable allows you to configure
 the C compilation output.
 """
 
-import os
-import string
 import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/TEX/PDFTEXFLAGS.py b/test/TEX/PDFTEXFLAGS.py
index 94c5466..5ae1825 100644
--- a/test/TEX/PDFTEXFLAGS.py
+++ b/test/TEX/PDFTEXFLAGS.py
@@ -25,7 +25,6 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os
-import os.path
 import string
 import sys
 import TestSCons
diff --git a/test/TEX/TEX.py b/test/TEX/TEX.py
index 5a0daec..c78ad18 100644
--- a/test/TEX/TEX.py
+++ b/test/TEX/TEX.py
@@ -31,7 +31,6 @@ and that we can use this to wrap calls to the real latex utility.
 """
 
 import os
-import os.path
 import string
 import sys
 import TestSCons
diff --git a/test/TEX/TEXCOM.py b/test/TEX/TEXCOM.py
index cf887a4..c7a1b9a 100644
--- a/test/TEX/TEXCOM.py
+++ b/test/TEX/TEXCOM.py
@@ -28,9 +28,8 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 Test the ability to configure the $TEXCOM construction variable.
 """
 
-import os
-import string
 import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/TEX/TEXCOMSTR.py b/test/TEX/TEXCOMSTR.py
index 66c2602..124868b 100644
--- a/test/TEX/TEXCOMSTR.py
+++ b/test/TEX/TEXCOMSTR.py
@@ -29,9 +29,8 @@ Test that the $TEXCOMSTR construction variable allows you to configure
 the C compilation output.
 """
 
-import os
-import string
 import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/TEX/TEXFLAGS.py b/test/TEX/TEXFLAGS.py
index c27ffe5..6dcf95d 100644
--- a/test/TEX/TEXFLAGS.py
+++ b/test/TEX/TEXFLAGS.py
@@ -25,7 +25,6 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os
-import os.path
 import string
 import sys
 import TestSCons
diff --git a/test/TEX/dryrun.py b/test/TEX/dryrun.py
index 80458af..cf7f9ba 100644
--- a/test/TEX/dryrun.py
+++ b/test/TEX/dryrun.py
@@ -31,9 +31,7 @@ and that we can use this to wrap calls to the real latex utility.
 """
 
 import os
-import os.path
-import string
-import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/TEX/rename_result.py b/test/TEX/rename_result.py
index e14d502..11b4ccf 100644
--- a/test/TEX/rename_result.py
+++ b/test/TEX/rename_result.py
@@ -30,9 +30,7 @@ target name provided by the user.
 """
 
 import os
-import os.path
-import string
-import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/TEX/usepackage.py b/test/TEX/usepackage.py
index 4be7f58..e23a8fc 100644
--- a/test/TEX/usepackage.py
+++ b/test/TEX/usepackage.py
@@ -31,9 +31,7 @@ and that we can use this to wrap calls to the real latex utility.
 """
 
 import os
-import os.path
-import string
-import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/Value.py b/test/Value.py
index 01cb370..ea6e682 100644
--- a/test/Value.py
+++ b/test/Value.py
@@ -24,9 +24,9 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-import os
 import re
 import sys
+
 import TestSCons
 import TestCmd
 
diff --git a/test/Variables/ListVariable.py b/test/Variables/ListVariable.py
index 740698b..8c6c777 100644
--- a/test/Variables/ListVariable.py
+++ b/test/Variables/ListVariable.py
@@ -29,7 +29,6 @@ Test the ListVariable canned Variable type.
 """
 
 import os
-import os.path
 import string
 
 import TestSCons
diff --git a/test/Variables/chdir.py b/test/Variables/chdir.py
index ad907c6..87e9657 100644
--- a/test/Variables/chdir.py
+++ b/test/Variables/chdir.py
@@ -51,7 +51,6 @@ print "VARIABLE =", repr(env['VARIABLE'])
 
 test.write(['bin', 'opts.cfg'], """\
 import os
-import os.path
 os.chdir(os.path.split(__name__)[0])
 execfile('opts2.cfg')
 """)
diff --git a/test/Variables/help.py b/test/Variables/help.py
index dcea68e..acfdbd6 100644
--- a/test/Variables/help.py
+++ b/test/Variables/help.py
@@ -29,7 +29,6 @@ Test the Variables help messages.
 """
 
 import os.path
-import string
 
 try:
     True, False
diff --git a/test/Variables/import.py b/test/Variables/import.py
index 899870b..182ed26 100644
--- a/test/Variables/import.py
+++ b/test/Variables/import.py
@@ -52,7 +52,6 @@ print "VARIABLE =", env.get('VARIABLE')
 """
 
 test.write(['bin', 'opts.cfg'], """\
-import sys
 from local_options import VARIABLE
 """ % locals())
 
diff --git a/test/VariantDir/VariantDir.py b/test/VariantDir/VariantDir.py
index 3906cd7..813bb2f 100644
--- a/test/VariantDir/VariantDir.py
+++ b/test/VariantDir/VariantDir.py
@@ -24,10 +24,8 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-import os.path
 import string
 import sys
-import time
 import TestSCons
 
 _exe = TestSCons._exe
diff --git a/test/VariantDir/errors.py b/test/VariantDir/errors.py
index 22a4821..80f47d5 100644
--- a/test/VariantDir/errors.py
+++ b/test/VariantDir/errors.py
@@ -31,7 +31,6 @@ is read-only.
 """
 
 import os
-import os.path
 import stat
 import sys
 import TestSCons
diff --git a/test/Win32/bad-drive.py b/test/Win32/bad-drive.py
index 4961386..5b473bc 100644
--- a/test/Win32/bad-drive.py
+++ b/test/Win32/bad-drive.py
@@ -31,7 +31,6 @@ with an invalid drive letter.
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os
-import os.path
 import string
 import sys
 
diff --git a/test/Win32/default-drive.py b/test/Win32/default-drive.py
index 94d8377..9c17c19 100644
--- a/test/Win32/default-drive.py
+++ b/test/Win32/default-drive.py
@@ -31,8 +31,6 @@ file's drive as the default.
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os
-import os.path
-import string
 import sys
 
 import TestSCons
diff --git a/test/Win32/mingw.py b/test/Win32/mingw.py
index fac8910..feb5373 100644
--- a/test/Win32/mingw.py
+++ b/test/Win32/mingw.py
@@ -28,13 +28,12 @@ This tests the MinGW C/C++ compiler support.
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-import TestSCons
-import sys
-import os.path
 import os
-import TestCmd
-import time
 import string
+import sys
+
+import TestSCons
+import TestCmd
 
 test = TestSCons.TestSCons(match = TestCmd.match_re_dotall)
 
diff --git a/test/YACC/YACC.py b/test/YACC/YACC.py
index bef959f..a00d640 100644
--- a/test/YACC/YACC.py
+++ b/test/YACC/YACC.py
@@ -25,7 +25,6 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os
-import os.path
 import string
 import sys
 import TestSCons
diff --git a/test/YACC/YACCFLAGS.py b/test/YACC/YACCFLAGS.py
index 91b391b..39b510a 100644
--- a/test/YACC/YACCFLAGS.py
+++ b/test/YACC/YACCFLAGS.py
@@ -25,7 +25,6 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os
-import os.path
 import string
 import sys
 import TestSCons
diff --git a/test/ZIP/ZIP.py b/test/ZIP/ZIP.py
index 646677d..10f0efd 100644
--- a/test/ZIP/ZIP.py
+++ b/test/ZIP/ZIP.py
@@ -25,7 +25,6 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os
-import os.path
 import stat
 import string
 import sys
diff --git a/test/ZIP/ZIPCOM.py b/test/ZIP/ZIPCOM.py
index 460abe4..37af758 100644
--- a/test/ZIP/ZIPCOM.py
+++ b/test/ZIP/ZIPCOM.py
@@ -28,9 +28,8 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 Test the ability to configure the $ZIPCOM construction variable.
 """
 
-import os
-import string
 import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/emitter.py b/test/emitter.py
index a7f6b3f..b76db7c 100644
--- a/test/emitter.py
+++ b/test/emitter.py
@@ -26,7 +26,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import TestSCons
 import os
-import os.path
 
 test = TestSCons.TestSCons()
 
diff --git a/test/exceptions.py b/test/exceptions.py
index 12efdf0..b51c1ea 100644
--- a/test/exceptions.py
+++ b/test/exceptions.py
@@ -24,11 +24,11 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-import os
 import re
 import sys
-import TestSCons
+
 import TestCmd
+import TestSCons
 
 _python_ = TestSCons._python_
 
diff --git a/test/expansion.py b/test/expansion.py
index 0f72134..b438ff4 100644
--- a/test/expansion.py
+++ b/test/expansion.py
@@ -29,8 +29,7 @@ Test construction variable expansion in Builder paths.
 """
 
 import os.path
-import sys
-import time
+
 import TestSCons
 
 _exe = TestSCons._exe
diff --git a/test/explain/function-actions.py b/test/explain/function-actions.py
index b28747d..7e6a2d4 100644
--- a/test/explain/function-actions.py
+++ b/test/explain/function-actions.py
@@ -29,9 +29,6 @@ Verify that --debug=explain correctly handles changes to actions
 that contain a list of function Actions.
 """
 
-import os.path
-import string
-import sys
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/explain/save-info.py b/test/explain/save-info.py
index b72b3fb..f6ff39a 100644
--- a/test/explain/save-info.py
+++ b/test/explain/save-info.py
@@ -28,9 +28,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 Verify that the --debug=explain information gets saved by default.
 """
 
-import os.path
-import string
-import sys
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/ignore-command.py b/test/ignore-command.py
index c1e6149..17ab4d0 100644
--- a/test/ignore-command.py
+++ b/test/ignore-command.py
@@ -29,11 +29,7 @@ Test use of a preceding - to ignore the return value from a command.
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os
-import os.path
-import re
-import string
 import sys
-import TestCmd
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/implicit/IMPLICIT_COMMAND_DEPENDENCIES.py b/test/implicit/IMPLICIT_COMMAND_DEPENDENCIES.py
index e5021da..9a018a3 100644
--- a/test/implicit/IMPLICIT_COMMAND_DEPENDENCIES.py
+++ b/test/implicit/IMPLICIT_COMMAND_DEPENDENCIES.py
@@ -30,6 +30,8 @@ whether or not the implicit dependency on executed commands
 is added to targets.
 """
 
+import os
+
 import TestSCons
 
 python = TestSCons.python
@@ -44,7 +46,7 @@ import sys
 
 open(sys.argv[1], 'w').write('''\
 #!/usr/bin/env %(python)s
-import os.path
+import os
 import string
 import sys
 fp = open(sys.argv[1], 'wb')
diff --git a/test/long-lines.py b/test/long-lines.py
index 340cd9a..02551ce 100644
--- a/test/long-lines.py
+++ b/test/long-lines.py
@@ -25,9 +25,8 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os
-import os.path
-import string
 import sys
+
 import TestSCons
 
 test = TestSCons.TestSCons()
diff --git a/test/option--.py b/test/option--.py
index 9540397..f6a16a2 100644
--- a/test/option--.py
+++ b/test/option--.py
@@ -25,8 +25,8 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os.path
-import string
 import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/option--C.py b/test/option--C.py
index 47e067b..8ce52a9 100644
--- a/test/option--C.py
+++ b/test/option--C.py
@@ -24,12 +24,12 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-import TestSCons
+import os
 import string
-import sys
-import os.path
 import types
 
+import TestSCons
+
 def match_normcase(lines, matches):
     if not type(lines) is types.ListType:
         lines = string.split(lines, "\n")
diff --git a/test/option--I.py b/test/option--I.py
index 0f422e6..b7cc1f4 100644
--- a/test/option--I.py
+++ b/test/option--I.py
@@ -25,8 +25,6 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import TestSCons
-import string
-import sys
 
 test = TestSCons.TestSCons()
 
diff --git a/test/option--Q.py b/test/option--Q.py
index f99031c..ce9a161 100644
--- a/test/option--Q.py
+++ b/test/option--Q.py
@@ -25,8 +25,8 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os.path
-import string
 import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/option--R.py b/test/option--R.py
index c61167b..7208e90 100644
--- a/test/option--R.py
+++ b/test/option--R.py
@@ -25,8 +25,6 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import TestSCons
-import string
-import sys
 
 test = TestSCons.TestSCons()
 
diff --git a/test/option--S.py b/test/option--S.py
index fbe9128..719241d 100644
--- a/test/option--S.py
+++ b/test/option--S.py
@@ -25,8 +25,6 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import TestSCons
-import string
-import sys
 
 test = TestSCons.TestSCons()
 
diff --git a/test/option--W.py b/test/option--W.py
index f6d07e8..8c4a616 100644
--- a/test/option--W.py
+++ b/test/option--W.py
@@ -25,8 +25,6 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import TestSCons
-import string
-import sys
 
 test = TestSCons.TestSCons()
 
diff --git a/test/option--duplicate.py b/test/option--duplicate.py
index c8874e7..6c631b3 100644
--- a/test/option--duplicate.py
+++ b/test/option--duplicate.py
@@ -29,10 +29,7 @@ SConscript settable option.
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-import string
-import sys
 import os
-import os.path
 import stat
 import TestSCons
 
diff --git a/test/option--la.py b/test/option--la.py
index 5f244d6..af038e4 100644
--- a/test/option--la.py
+++ b/test/option--la.py
@@ -25,8 +25,6 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import TestSCons
-import string
-import sys
 
 test = TestSCons.TestSCons()
 
diff --git a/test/option--ld.py b/test/option--ld.py
index ae02d77..ad39d90 100644
--- a/test/option--ld.py
+++ b/test/option--ld.py
@@ -25,8 +25,6 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import TestSCons
-import string
-import sys
 
 test = TestSCons.TestSCons()
 
diff --git a/test/option--lw.py b/test/option--lw.py
index 56d4bda..6a8f07a 100644
--- a/test/option--lw.py
+++ b/test/option--lw.py
@@ -25,8 +25,6 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import TestSCons
-import string
-import sys
 
 test = TestSCons.TestSCons()
 
diff --git a/test/option--max-drift.py b/test/option--max-drift.py
index 1ac077a..6d820fe 100644
--- a/test/option--max-drift.py
+++ b/test/option--max-drift.py
@@ -24,9 +24,7 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-import os.path
 import os
-import string
 import sys
 import TestSCons
 
diff --git a/test/option--override.py b/test/option--override.py
index 544a0b8..c345916 100644
--- a/test/option--override.py
+++ b/test/option--override.py
@@ -25,8 +25,6 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import TestSCons
-import string
-import sys
 
 test = TestSCons.TestSCons()
 
diff --git a/test/option--wf.py b/test/option--wf.py
index e8bc701..760a5cd 100644
--- a/test/option--wf.py
+++ b/test/option--wf.py
@@ -25,8 +25,6 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import TestSCons
-import string
-import sys
 
 test = TestSCons.TestSCons()
 
diff --git a/test/option--wuv.py b/test/option--wuv.py
index 7fd731a..3456746 100644
--- a/test/option--wuv.py
+++ b/test/option--wuv.py
@@ -25,8 +25,6 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import TestSCons
-import string
-import sys
 
 test = TestSCons.TestSCons()
 
diff --git a/test/option-b.py b/test/option-b.py
index cdaf348..495e933 100644
--- a/test/option-b.py
+++ b/test/option-b.py
@@ -25,8 +25,6 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import TestSCons
-import string
-import sys
 
 test = TestSCons.TestSCons()
 
diff --git a/test/option-c.py b/test/option-c.py
index e709709..323c89d 100644
--- a/test/option-c.py
+++ b/test/option-c.py
@@ -28,8 +28,9 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 Test various uses of the -c (clean) option.
 """
 
-import os.path
+import os
 import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/option-f.py b/test/option-f.py
index a8c7c7b..8fb585c 100644
--- a/test/option-f.py
+++ b/test/option-f.py
@@ -24,8 +24,9 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
+import os
+
 import TestSCons
-import os.path
 
 test = TestSCons.TestSCons()
 
diff --git a/test/option-l.py b/test/option-l.py
index 65ec69b..57659e4 100644
--- a/test/option-l.py
+++ b/test/option-l.py
@@ -25,8 +25,6 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import TestSCons
-import string
-import sys
 
 test = TestSCons.TestSCons()
 
diff --git a/test/option-m.py b/test/option-m.py
index 8ec28b7..f44f6f3 100644
--- a/test/option-m.py
+++ b/test/option-m.py
@@ -25,8 +25,6 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import TestSCons
-import string
-import sys
 
 test = TestSCons.TestSCons()
 
diff --git a/test/option-n.py b/test/option-n.py
index dd67d27..9f7391e 100644
--- a/test/option-n.py
+++ b/test/option-n.py
@@ -40,10 +40,9 @@ This test verifies:
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os
-import os.path
 import re
-import string
 import sys
+
 import TestCmd
 import TestSCons
 
diff --git a/test/option-o.py b/test/option-o.py
index caa3d76..d73ca51 100644
--- a/test/option-o.py
+++ b/test/option-o.py
@@ -25,8 +25,6 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import TestSCons
-import string
-import sys
 
 test = TestSCons.TestSCons()
 
diff --git a/test/option-p.py b/test/option-p.py
index 52228ef..beb3a2f 100644
--- a/test/option-p.py
+++ b/test/option-p.py
@@ -25,8 +25,6 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import TestSCons
-import string
-import sys
 
 test = TestSCons.TestSCons()
 
diff --git a/test/option-r.py b/test/option-r.py
index 9770c9a..42c08c4 100644
--- a/test/option-r.py
+++ b/test/option-r.py
@@ -25,8 +25,6 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import TestSCons
-import string
-import sys
 
 test = TestSCons.TestSCons()
 
diff --git a/test/option-s.py b/test/option-s.py
index b3bde5f..20f39fb 100644
--- a/test/option-s.py
+++ b/test/option-s.py
@@ -25,8 +25,8 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os.path
-import string
 import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/option-t.py b/test/option-t.py
index ac53b81..905f7d3 100644
--- a/test/option-t.py
+++ b/test/option-t.py
@@ -25,8 +25,6 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import TestSCons
-import string
-import sys
 
 test = TestSCons.TestSCons()
 
diff --git a/test/option-unknown.py b/test/option-unknown.py
index 19ac9ab..bfe4cd8 100644
--- a/test/option-unknown.py
+++ b/test/option-unknown.py
@@ -24,10 +24,7 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-import TestCmd
 import TestSCons
-import string
-import sys
 
 test = TestSCons.TestSCons()
 
diff --git a/test/option-v.py b/test/option-v.py
index 970dbd4..b91e4d9 100644
--- a/test/option-v.py
+++ b/test/option-v.py
@@ -26,9 +26,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import TestCmd
 import TestSCons
-import re
-import string
-import sys
 
 test = TestSCons.TestSCons(match = TestCmd.match_re)
 
diff --git a/test/option/debug-count.py b/test/option/debug-count.py
index d301312..11ad66f 100644
--- a/test/option/debug-count.py
+++ b/test/option/debug-count.py
@@ -28,11 +28,10 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 Test that the --debug=count option works.
 """
 
-import TestSCons
-import sys
 import string
 import re
-import time
+
+import TestSCons
 
 test = TestSCons.TestSCons()
 
diff --git a/test/option/debug-findlibs.py b/test/option/debug-findlibs.py
index 4220402..70fa5b8 100644
--- a/test/option/debug-findlibs.py
+++ b/test/option/debug-findlibs.py
@@ -24,11 +24,6 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-import sys
-import string
-import re
-import time
-
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/option/debug-includes.py b/test/option/debug-includes.py
index b923306..1b7d363 100644
--- a/test/option/debug-includes.py
+++ b/test/option/debug-includes.py
@@ -30,9 +30,6 @@ dependencies of a target.
 """
 
 import TestSCons
-import sys
-import re
-import time
 
 test = TestSCons.TestSCons()
 
diff --git a/test/option/debug-memory.py b/test/option/debug-memory.py
index 9ed674e..b130ab9 100644
--- a/test/option/debug-memory.py
+++ b/test/option/debug-memory.py
@@ -28,11 +28,10 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 Test that the --debug=memory option works.
 """
 
-import TestSCons
-import sys
-import string
 import re
-import time
+import string
+
+import TestSCons
 
 test = TestSCons.TestSCons()
 
diff --git a/test/option/debug-objects.py b/test/option/debug-objects.py
index 33ec59d..1d3829a 100644
--- a/test/option/debug-objects.py
+++ b/test/option/debug-objects.py
@@ -29,10 +29,6 @@ Test that the --debug=objects option works.
 """
 
 import TestSCons
-import sys
-import string
-import re
-import time
 
 test = TestSCons.TestSCons()
 
diff --git a/test/option/tree-all.py b/test/option/tree-all.py
index d569b31..aa92936 100644
--- a/test/option/tree-all.py
+++ b/test/option/tree-all.py
@@ -32,8 +32,6 @@ complete dependencies of a target.
 import TestSCons
 import sys
 import string
-import re
-import time
 
 test = TestSCons.TestSCons()
 
diff --git a/test/option/tree-derived.py b/test/option/tree-derived.py
index 3f7cb45..3ec33d7 100644
--- a/test/option/tree-derived.py
+++ b/test/option/tree-derived.py
@@ -30,9 +30,6 @@ dependencies (sources or Depends()) of a target.
 """
 
 import TestSCons
-import sys
-import re
-import time
 
 test = TestSCons.TestSCons()
 
diff --git a/test/option/tree-lib.py b/test/option/tree-lib.py
index d1fdcd2..c9293c2 100644
--- a/test/option/tree-lib.py
+++ b/test/option/tree-lib.py
@@ -33,8 +33,6 @@ on disk.)
 Issue 1363:  http://scons.tigris.org/issues/show_bug.cgi?id=1363
 """
 
-import sys
-
 import TestSCons
 
 test = TestSCons.TestSCons()
diff --git a/test/overrides.py b/test/overrides.py
index dabf689..ac936d5 100644
--- a/test/overrides.py
+++ b/test/overrides.py
@@ -25,7 +25,6 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import TestSCons
-import sys
 
 
 test = TestSCons.TestSCons()
diff --git a/test/packaging/guess-package-name.py b/test/packaging/guess-package-name.py
index 5b4cd67..9c91248 100644
--- a/test/packaging/guess-package-name.py
+++ b/test/packaging/guess-package-name.py
@@ -33,7 +33,6 @@ Also overriding this default package name is tested
 Furthermore that targz is the default packager is tested.
 """
 
-import os
 import TestSCons
 
 python = TestSCons.python
diff --git a/test/packaging/msi/explicit-target.py b/test/packaging/msi/explicit-target.py
index 745f0c1..e7b0c2d 100644
--- a/test/packaging/msi/explicit-target.py
+++ b/test/packaging/msi/explicit-target.py
@@ -29,7 +29,6 @@ Test the ability to use a explicit target package name and the use
 of FindInstalledFiles() in conjuction with .msi packages.
 """
 
-import os
 import TestSCons
 
 python = TestSCons.python
diff --git a/test/packaging/msi/package.py b/test/packaging/msi/package.py
index e6ce668..3fb4e6e 100644
--- a/test/packaging/msi/package.py
+++ b/test/packaging/msi/package.py
@@ -28,7 +28,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 Test the ability to create a simple msi package.
 """
 
-import os
 import TestSCons
 
 python = TestSCons.python
diff --git a/test/packaging/rpm/explicit-target.py b/test/packaging/rpm/explicit-target.py
index b9fcc0f..2949a2f 100644
--- a/test/packaging/rpm/explicit-target.py
+++ b/test/packaging/rpm/explicit-target.py
@@ -28,7 +28,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 Test the ability to create a rpm package from a explicit target name.
 """
 
-import os
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/packaging/tar/bz2.py b/test/packaging/tar/bz2.py
index 938ac11..3a12a9b 100644
--- a/test/packaging/tar/bz2.py
+++ b/test/packaging/tar/bz2.py
@@ -29,7 +29,6 @@ This tests the SRC bz2 packager, which does the following:
  - create a tar package from the specified files
 """
 
-import os
 import TestSCons
 
 python = TestSCons.python
diff --git a/test/packaging/tar/gz.py b/test/packaging/tar/gz.py
index 26ce60d..6582ed2 100644
--- a/test/packaging/tar/gz.py
+++ b/test/packaging/tar/gz.py
@@ -29,7 +29,6 @@ This tests the SRC 'targz' packager, which does the following:
  - create a targz package containing the specified files.
 """
 
-import os
 import TestSCons
 
 python = TestSCons.python
diff --git a/test/preserve-source.py b/test/preserve-source.py
index 3c29828..f7abc4c 100644
--- a/test/preserve-source.py
+++ b/test/preserve-source.py
@@ -25,7 +25,7 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os.path
-import sys
+
 import TestSCons
 
 test = TestSCons.TestSCons()
diff --git a/test/python-version.py b/test/python-version.py
index a75ccd5..56f65b2 100644
--- a/test/python-version.py
+++ b/test/python-version.py
@@ -32,7 +32,6 @@ of Python.
 import os
 import re
 import string
-import sys
 
 import TestCmd
 import TestSCons
diff --git a/test/redirection.py b/test/redirection.py
index cededdb..64756ff 100644
--- a/test/redirection.py
+++ b/test/redirection.py
@@ -24,7 +24,6 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-import os
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/runtest/fallback.py b/test/runtest/fallback.py
index 5e97f81..5ef2363 100644
--- a/test/runtest/fallback.py
+++ b/test/runtest/fallback.py
@@ -30,7 +30,6 @@ if it can't find qmtest on the $PATH.
 """
 
 import os
-import os.path
 import re
 import string
 
diff --git a/test/runtest/python.py b/test/runtest/python.py
index aa1af22..d26f98e 100644
--- a/test/runtest/python.py
+++ b/test/runtest/python.py
@@ -29,8 +29,6 @@ Test that the -P option lets us specify a Python version to use.
 """
 
 import os.path
-import re
-import sys
 
 if not hasattr(os.path, 'pardir'):
     os.path.pardir = '..'
diff --git a/test/runtest/testlistfile.py b/test/runtest/testlistfile.py
index 0ca822d..0c9d84c 100644
--- a/test/runtest/testlistfile.py
+++ b/test/runtest/testlistfile.py
@@ -30,7 +30,6 @@ Test a list of tests to run in a file specified with the -f option.
 
 import os.path
 
-import TestCmd
 import TestRuntest
 
 test_fail_py = os.path.join('test', 'fail.py')
diff --git a/test/scons-time/run/config/scons.py b/test/scons-time/run/config/scons.py
index 45ca369..be34dde 100644
--- a/test/scons-time/run/config/scons.py
+++ b/test/scons-time/run/config/scons.py
@@ -28,7 +28,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 Verify specifying an alternate SCons through a config file.
 """
 
-import os
 
 import TestSCons_time
 
diff --git a/test/scons-time/unknown.py b/test/scons-time/unknown.py
index 2fb673f..cee07c4 100644
--- a/test/scons-time/unknown.py
+++ b/test/scons-time/unknown.py
@@ -29,7 +29,6 @@ Verify that invoking scons-test with an unknown argument generates
 the appropriate error message and exits non-zero.
 """
 
-import os
 
 import TestSCons_time
 
diff --git a/test/sconsign/corrupt.py b/test/sconsign/corrupt.py
index fd46de4..c4d007c 100644
--- a/test/sconsign/corrupt.py
+++ b/test/sconsign/corrupt.py
@@ -28,7 +28,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 Test that we get proper warnings when .sconsign* files are corrupt.
 """
 
-import os
 import TestSCons
 import TestCmd
 import cPickle
diff --git a/test/sconsign/script/Configure.py b/test/sconsign/script/Configure.py
index 19c8a1c..a4cac58 100644
--- a/test/sconsign/script/Configure.py
+++ b/test/sconsign/script/Configure.py
@@ -29,7 +29,7 @@ Verify that we can print .sconsign files with Configure context
 info in them (which have different BuildInfo entries).
 """
 
-import os.path
+import os
 import re
 
 import TestSCons
diff --git a/test/signature-order.py b/test/signature-order.py
index 6ec839d..c97899f 100644
--- a/test/signature-order.py
+++ b/test/signature-order.py
@@ -33,7 +33,6 @@ but
 
 """
 
-import sys
 import TestSCons
 
 _exe = TestSCons._exe
diff --git a/test/silent-command.py b/test/silent-command.py
index 476158a..e370d21 100644
--- a/test/silent-command.py
+++ b/test/silent-command.py
@@ -29,11 +29,8 @@ Test the use of a preceding @ to suppress printing a command.
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os
-import os.path
-import re
-import string
 import sys
-import TestCmd
+
 import TestSCons
 
 _python_ = TestSCons._python_
diff --git a/test/special-filenames.py b/test/special-filenames.py
index 11930e5..f41ae26 100644
--- a/test/special-filenames.py
+++ b/test/special-filenames.py
@@ -24,7 +24,6 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-import os
 import string
 import sys
 
diff --git a/test/timestamp-fallback.py b/test/timestamp-fallback.py
index 0774995..1f544ea 100644
--- a/test/timestamp-fallback.py
+++ b/test/timestamp-fallback.py
@@ -31,7 +31,6 @@ hashlib and no underlying md5 module available.
 
 import imp
 import os
-import os.path
 
 import TestSCons
 
diff --git a/test/tool_args.py b/test/tool_args.py
index f768256..0bd1a11 100644
--- a/test/tool_args.py
+++ b/test/tool_args.py
@@ -30,8 +30,7 @@ a Tool specification's generate() method.
 """
 
 import os.path
-import sys
-import time
+
 import TestSCons
 
 test = TestSCons.TestSCons()
diff --git a/test/toolpath/basic.py b/test/toolpath/basic.py
index 7e08f8a..7c324b0 100644
--- a/test/toolpath/basic.py
+++ b/test/toolpath/basic.py
@@ -25,8 +25,7 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os.path
-import sys
-import time
+
 import TestSCons
 
 test = TestSCons.TestSCons()