Remove (lots) more unnecessary imports.

git-svn-id: http://scons.tigris.org/svn/scons/trunk@3973 fdb21ef1-2011-0410-befe-b5e4ea1792b1

diff --git a/test/AS/ASCOM.py b/test/AS/ASCOM.py
index 42925814317df496dedfcc8c82415d52e747f2fa..6ad7e6e2d323861ace50b0279d7cd75abbd4bc10 100644 (file)
--- 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 287da160da87ba832b5a096e2918391fc5a2ce11..d146229c041291840c08aececf24c3d8c6acd9c5 100644 (file)
--- 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 a0da9ffbf58bd9e58dd176d2542f11c03098f25d..7297620d63c13043fa6352c067421e8589653588 100644 (file)
--- 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 2045a3d64ac613521b7e454601b7e1e831b2ffdc..f2c3e44f70cc8aadf1e0023e8ac4afbd11eaefc2 100644 (file)
--- 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 bb330dcd2a26c56cbb3c9176dd0218990f3f6d45..6f2bde5d3768bef110bf41a657d1708649902ce3 100644 (file)
--- 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 1956154c2cc4111632fcac8b34fe73a92c3ced2e..37a61df7f4e0da39746d2aa41d6872dd7053fb73 100644 (file)
--- 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 27858bdbe03cb2616fb43178d5af6e1aa82a98b9..2410435cec5d346b8ca768922a9d7b1b7d136307 100644 (file)
--- 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 fa3bb640291d69e07f14c9b52739716ec56e25a0..4b13107f906d1962db63883cbdb635884ced2fa9 100644 (file)
--- 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 674c628aac8302f441fb2e7072009b4dc4197f0e..647b6e98b1dea1fabf42eeb413a5eb000e1ecf69 100644 (file)
--- 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 57ee11e2133fd3db341f622e18dcec49cad6b12c..b41b63a87bfe65fb9862c64b9d028fb1ffe0b9e1 100644 (file)
--- 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 f7a03378df14cbb846efbf27f60465825ef3d43a..2bf849e3493ea4f6d2669b497f04b24b7a69515f 100644 (file)
--- 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 ea0eac2da34622770f978e3f5429baef40d7d9c3..263df3cdccd2693be9ac536181ce54e31f07bc34 100644 (file)
--- 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 36876c4435c26de8b45ec77b782f22981cca7e0b..964bae40dbac33e1e784163ca628c2abb4525e3c 100644 (file)
--- 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 3ce14dde62780009c6b596874982374aae0f9f4a..b6254e92301e2fd1b51fe9353c4acdf11b7afbf3 100644 (file)
--- 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 d1f07fd53145e10c162d9aa86b7884a3e1e3ccbe..5b59ae4ea7cac1a73c2311b4301ede7900d4425b 100644 (file)
--- 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 ca13ec81ac062b61a139884b7450611c408e87aa..9cc5430c8035dc2c7ad27ff6eb8516f9f11ee1dc 100644 (file)
--- 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 50ddb5ad99b1a51faefa9b4e5bf7307a3f54d0ca..bd54a153659cc53e0e616603c789865c5ecf26d4 100644 (file)
--- 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 5606fd0393ede241f0d7b185061abbec5d3ebb4e..695ad59157992014697fdda8a2d532d7c700419c 100644 (file)
--- 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 562961a726fffa146069a706921145ccbefc6ecd..31a46c4772ee828d92eb5e9812c0128ebd7d0f84 100644 (file)
--- 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 08c40c29a73bb3aeb7d27b3c67de11d579c32ec6..a8c44a6bf8e932e910157ad57dd20320575de814 100644 (file)
--- 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 1aaf4a3bbda5a52dca6da057984378b50b42dd9a..a8212963c233e6035a7701050e255df34080edcc 100644 (file)
--- 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 305cf044442d4bf16f4aa4223657dce06affc720..6133bdf47d3d71d88711ae03a0ab540d5be6fbb0 100644 (file)
--- 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 c21d9ad3a965cea921026097c2d9106e1af911ae..510539cc38651ab7f8c3d492ec9da83dbcdb6c66 100644 (file)
--- 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 5fc40d05b53d3a5ec7d8254fca6b9e26048197fd..64e4a50f17a8e19f6316309e5edd242dfe790cf4 100644 (file)
--- 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 df4a87b7c37ae38d888889b4acb0f9d0b6dc328b..e738533ed13494c95465542585ae08f58eb39dd7 100644 (file)
--- 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 d2a70c3ac1ce1af2170cd2d395fc1affab92ced6..f74ec848099246773ad1007a2a8c83e1dcde85ff 100644 (file)
--- 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 628bc00188d0c21c9bfb13bad5bcad33c6f773e0..1a8750feeaad700ddda4028f3406eb40ff595fb9 100644 (file)
--- 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 dd92541524b82e961be85c62e549bd1e8ff27fd5..829c9e4a9e2ca33683ad4998ae9c32d02d407690 100644 (file)
--- 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 ebf67f71fa56df2d848a12d3ee4b7d03aa8a42b1..93012411048e246e9468b9bd5e0c61107a79045e 100644 (file)
--- 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 6dd1f9413c005a66cf54b9cf189f781d240e550f..3bc8ec1152f939a5630cf0c6436ca3ba3e7e5e22 100644 (file)
--- 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 0a491645b48a2d8c652f1ad833834d4fb8d4647d..3830cd2ee8bc4fd307534c92159c5b16818395db 100644 (file)
--- 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 61d21eb283b1c18a3de63b364e414ff1121c0ca4..b603f35dcca9ad590df62252aab048341eb62f97 100644 (file)
--- 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 65c64038b99bf47fbb95a20342bb511fb6b483b3..22436258a70d0d29aa0e8986933362c7cd53c771 100644 (file)
--- 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 63fcb939a67ea1a1426e4241571f3b898267c5f5..be2d77d532818eaf99df76d5998a07e8c4c07252 100644 (file)
--- 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 48524c2c69a6505437013e9b7372c1df4f2094a9..7dc8773b26d9a38fcfb09a91ad339f84956bf1e9 100644 (file)
--- 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 3fcfcbde243ae2255435e3634bcb1261a21eaee6..a48029db7deb2769d28ba957196b55957614c93d 100644 (file)
--- 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 9f585139295e0a387a857362a84f21fdbd344308..9abdc619a7c314d4353d556e9bb6cd1e6b920e11 100644 (file)
--- 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 768d102c402e3e78b33dfd6a245048a73d4d4d9a..252c458c9a7ab400c350649273fde5148aa77003 100644 (file)
--- 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 8b443f8960d69a59fd501877c03de47129a3631e..47f7c3b4737d20bf39b3bbebdc05e1a7876fa061 100644 (file)
--- 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 a344112ee64901ee37f746fa6314c48b29098096..93e34f94928ac642ece6642b5833cc8aa9ee2394 100644 (file)
--- 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 709ea8b486cb31e65e8b2f1b5735d361a4327efb..a99d14f92726ae16f7317b77114be01d04e57e72 100644 (file)
--- 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 62792b6ce6c18876d8e8f59ba40fe007eacc7e90..369a8e129562e3dbf379317e3655b71187f714e1 100644 (file)
--- 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 dd4eb70b7e1731b1ff3905772632d3be85e6d953..5d6d3ffbcb45d45b54c982203191c7b69c40030f 100644 (file)
--- 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 2ad52539862de326f4f63f02bb09a3fd0e3816d4..3905c7775329745a2e0e701d5a482b4ffb351cdc 100644 (file)
--- 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 93849867ed45704122861f9b4b3c1a6970179086..5a1627baf907127532a982d43e8f5a9d91af5ca5 100644 (file)
--- 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 50122963d9b132dd7156c86af0e2046b433dee3f..2bfdd6591349272a70c6049511ebdac197638a75 100644 (file)
--- 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 ec6d3d273a78271633079a144ae2616a77867f8f..12a596fb0dd82ba2ac05ac3a69e798c4ccbbad43 100644 (file)
--- 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 01d05daee959435a5c9721eac3016281674f8819..be9cb0922e4a2018b84c17e12c951f5d0c505cd5 100644 (file)
--- 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 8918052c5e1aaf17ed36da390b4cbbed505a3d95..3a772d7d323cab96e323e25b767df50b14000f49 100644 (file)
--- 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 9b6e067abcc596f4eaa4ee0f7ec3d058a7ffd42d..714b5b3acc47488e216675e55963e23941f42080 100644 (file)
--- 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 73b8ec017444e12c6f47df80aae972e49971a7cf..833abd5b4ac144af4ee8c65c00e0fb70f0e3851b 100644 (file)
--- 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 68165f30da4a12eb46e4bf64afa39b567a79036d..c797246a7a78c6b4683b965eadc30e5ca29870e5 100644 (file)
--- 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 e1973da6a43662f80ed0ef4871138080eb11ef26..cc6271977c07c038bf7dc49e49e1ce4e4ce077d4 100644 (file)
--- 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 c069f64a9d1d7f67aa62f37997c6f8822b41e363..d8f73f421b41e1173424d740562fcf21bdc4a6bc 100644 (file)
--- 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 465b5c76a2619335ff9fe02ab246337ef38e4d95..bf99b5b9ba0e208d1ab1fe91b8e36d9ee2aa6db1 100644 (file)
--- 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 3011fac71339ef55035b51107a5cfccf139b29c5..353405b9f800a5e975b0ffb4e4262b9e4c130081 100644 (file)
--- 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 6089d60a122413bd8e229c260f50c88bb13b029c..ab253696cd33f4dda1db167b1b27de0b0120bbc9 100644 (file)
--- 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 7acb89ec466e50cc6650c06f65f3cd5d4dd7fdfb..eab925d87ae6fba39b0b91e244d86e5f0459e271 100644 (file)
--- 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 fb16fca0ead8af1bc7d0c2db3a434cc6bd906182..1effcc19f21340dbf0a33b06784ce88050941ec4 100644 (file)
--- 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 88e0517a4a4fc72b7659ebced6f7e3d54c56c13c..ac9597cdf283de693dd154f7c6cee31a445bd137 100644 (file)
--- 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 c38edaa1b09aeb2892494a86766027594ceaaa59..8c52015795fd76b950dc219902c48e8a980b39f0 100644 (file)
--- 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 8b279f10ae06297b95e762d4f4fc6a1634406e34..ba832597d0b6a083ad765d114600ba7a434d18d7 100644 (file)
--- 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 3005859ae1eae8b71b6358872c5798d0c5a670d9..5a795afcae32739eb93d94dd84e405b1a281409c 100644 (file)
--- 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 3ec5b3bf5e8b9286632770e15fa57d8f5b94da6d..32e61a18d521856f08e299280e268633325b2ada 100644 (file)
--- 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 73f809652a4f7ddfcc7607941c7afb7982ec4ea5..ca7c92f5cc02f1e37b22b394dbf5278f66c3df84 100644 (file)
--- 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 ee552f45ee22d0cc216c67f115577fd13889b02c..34657ff7d2c46e92daca8c0c5704c293315a17da 100644 (file)
--- 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 09639ea674c5e0f34aa71f9857f69ae946bd6b87..baedac0f9ef79a23fb896862a0270bcda062006b 100644 (file)
--- 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 95abd33ff7a8a0beabd78828b808d5bd5ee062a3..32ad11957f2850f7fd81eb2449d1c2703b6ae245 100644 (file)
--- 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 3c0e1ed8c9eb08bba5b5d9b7062f0717b23c372c..0906513d3c1e43b2d23fd1cb352c680fe5bef267 100644 (file)
--- 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 f6d93c7a627bc9edcaa0aeb364f4436eeb2b64c5..20ebc250921ea455a539d3645d24d721fdb6e096 100644 (file)
--- 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 5bd8e2f59db44d93d70c0b27d6f875d3a6b6cfab..649cf010fe4f015d04985de8e7f60df697ed98d7 100644 (file)
--- 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 f9721c2f0adb6b99ca83cddbdc9ec631aa861a82..3340707ad3b5193e4dbb4de599f9a8268f912b13 100644 (file)
--- 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 b5f24f9435db6edfe8078d61f259d16f066c49f0..34e814b3ec6131abd98b50a7eb1de8b65c3bc8d2 100644 (file)
--- 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 3d3e990474341bd978d0bcd99366d5e044f9b6ff..3550e7684335fb42572c96a1d8492366e86d054d 100644 (file)
--- 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 91b4614dfc05a5296c119848701400098cd0a65b..94692dbbef45bd10283d655d7126ceac713efe98 100644 (file)
--- 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 e72fa9e8f209f03e49663a7a76aa15603b04bbc9..1555142c6a7e2cf181512176d31afdc3ad63ce52 100644 (file)
--- 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 d91404901466b9bb503397b39f1efee5a48781ad..db8a22150ce72f4c41706040ccb64f045e523908 100644 (file)
--- 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 1a7efbe19bcdbdb5998af798061e962530ffad92..9eb40271c43ccc6fe28978a2dcd78932a5b6aed0 100644 (file)
--- 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 2d2f718463591afba2eb7b67832c5e2d212b5f13..667564e46411c39af50b17eba983f8b5ae685e17 100644 (file)
--- 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 94740b89f2347fb1d28408215543096e00480fbb..a3dc2cf30282fe1137b388a6302f503d9899a61c 100644 (file)
--- 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 7fd4f9bd1ae7ade80ca664cf86df767b8f8db9cf..e52cb9fada74217fa57db35233a2916cd3a8c916 100644 (file)
--- 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 87b92fae002e4fd91c1c5dd013b37e4826b8d664..2af6a96cc73d59cec83c6801d9034e5ad8ba5c24 100644 (file)
--- 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 dc88e3b1e49f2e3d2dce3776daa451da9c1064b6..e2509fabf46afb78b971c17d20a1cdc7ad28fada 100644 (file)
--- 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 554f8dfa6cdd14d0ff49613ed534c1ca8bbc907b..b688a0bd13e4b9e557774f20cb1fad8a7b5cd7de 100644 (file)
--- 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 859c57ba76abb656b66e7a5faa102aa579c61b9f..d7d87bd53e41ca14f533d7c1e93e14398531c701 100644 (file)
--- 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 c0bc693db307a7235fa8858037718ca375e27ea7..8c5bb1406ce9f3c761dd7f411e72aa846392e752 100644 (file)
--- a/test/MSVC/PCHSTOP-errors.py
+++ b/test/MSVC/PCHSTOP-errors.py
@@ -1,75 +1,75 @@
-#!/usr/bin/env python\r
-#\r
-# __COPYRIGHT__\r
-#\r
-# Permission is hereby granted, free of charge, to any person obtaining\r
-# a copy of this software and associated documentation files (the\r
-# "Software"), to deal in the Software without restriction, including\r
-# without limitation the rights to use, copy, modify, merge, publish,\r
-# distribute, sublicense, and/or sell copies of the Software, and to\r
-# permit persons to whom the Software is furnished to do so, subject to\r
-# the following conditions:\r
-#\r
-# The above copyright notice and this permission notice shall be included\r
-# in all copies or substantial portions of the Software.\r
-#\r
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY\r
-# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE\r
-# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND\r
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE\r
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION\r
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION\r
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\r
-#\r
-\r
-__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"\r
-\r
-"""\r
-# Test error reporting\r
-"""\r
-\r
-import re\r
-import sys\r
-\r
-import TestSCons\r
-\r
-test = TestSCons.TestSCons(match = TestSCons.match_re)\r
-\r
-if sys.platform != 'win32':\r
-    msg = "Skipping Visual C/C++ test on non-Windows platform '%s'\n" % sys.platform\r
-    test.skip_test(msg)\r
-\r
-\r
-\r
-SConstruct_path = test.workpath('SConstruct')\r
-\r
-test.write(SConstruct_path, """\\r
-env = Environment()\r
-env['PDB'] = File('test.pdb')\r
-env['PCH'] = env.PCH('StdAfx.cpp')[0]\r
-if int(ARGUMENTS.get('SET_PCHSTOP')):\r
-    env['PCHSTOP'] = File('StdAfx.h')\r
-env.Program('test', 'test.cpp')\r
-""")\r
-\r
-\r
-\r
-expect_stderr = r'''\r
-scons: \*\*\* The PCHSTOP construction must be defined if PCH is defined.\r
-File "%s", line \d+, in \?\r
-''' % re.escape(SConstruct_path)\r
-\r
-test.run(arguments='SET_PCHSTOP=0', status=2, stderr=expect_stderr)\r
-\r
-\r
-\r
-expect_stderr = r'''\r
-scons: \*\*\* The PCHSTOP construction variable must be a string: .+\r
-File "%s", line \d+, in \?\r
-''' % re.escape(SConstruct_path)\r
-\r
-test.run(arguments='SET_PCHSTOP=1', status=2, stderr=expect_stderr)\r
-\r
-\r
-\r
-test.pass_test()\r
+#!/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 c2a2d0e39a1eb959a57cf61a4cc82cdbc5dfcf7b..fe464c4ca87b3b51b358522e260e5ef517a060b6 100644 (file)
--- 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 5a49a8c23ed0ee12e676892b5f057b643c78fe1a..66a8a8b8f8738aaa34e1b9be8ea2275c169c6bfd 100644 (file)
--- 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 c775bdc79b962ec97a66f8fc021efb01198f24f7..3edd711eac1f77adb78b8946898bab5aa3a92a99 100644 (file)
--- 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 64e90c94747f5083e8647d1908210d0408d56282..7056db19a2b4da9e20cb790007355cdbf869707b 100644 (file)
--- 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 ed2227649971dc35867d0b865d92fe8cefa72d88..8ba166f5ea006957f651855e46e5aa8dd8bd000e 100644 (file)
--- 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 c8353f4370b8d4eec156f253fb1e46e7a17853c1..991ac0b96004889768a9878bf5b4a8a1022d94d8 100644 (file)
--- 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 d8180bb61c361ef54b8dca6cdf48b6cda72485e4..62bbf3c51c377bd528f353abee3d6936311ed410 100644 (file)
--- 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 cf9814890959f875d81c2b17aa0b6ef745b7b327..a54d7c16e952bef9b171015975c3c35dbd56e0ba 100644 (file)
--- 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 6c4a2ebee126f630e49204c3613f8f6b86d382f7..bb6b8513ed191f4137dda89c924419b1de178d52 100644 (file)
--- 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 25e8b916f0c04496ce705803359135ce669f93bb..dde81c70b7c4307021eb5e603b8763d125b5ef7e 100644 (file)
--- 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 b6ebfdff8774ac3edd5004dca3596fe1fde819eb..28ae16e6bb0e5ed8e1f4917fc4b3b93a1ab00ec7 100644 (file)
--- 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 75e860ab768c357ee360857c46cb6643519381d9..3cf9c0549d59c2e213c6e2f1a4530b9147b1c3e1 100644 (file)
--- 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 6aaeffb9900272242b385298e0ceb57633e74204..9a918db439a5fa2f7e4b74243a56a7f2ff363b10 100644 (file)
--- 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 99ba7edf50b3e54ed645dbdf07b157467ca2a1ae..b6b10700515312ff9f4e0b36af95163fe009e072 100644 (file)
--- 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 d3d5d877e83292d2f883237285bffa41fdce27e8..46ed8b64e229509cfde4e9e3bcc86c582a5aa3d1 100644 (file)
--- 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 28dc558b89ee296d8ca86f0de5eefe1e1547e17f..1aceb460f8b5e302cee37ecaa5277e3386fc7f50 100644 (file)
--- 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 ff5a5043b494ad0a77a0cb0f80daab382e955067..82751c34e8aa27d4809675201058a88672210447 100644 (file)
--- 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 4df9c2434b1f6e20c87dad52c3be509556003d7e..d0038e3978c10a4a224143e61e90810e15c8b442 100644 (file)
--- 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 749c745ed37dc380640f0f4f794552ab950c84fd..28b94216532826388c2293eb44b4807dd8873af5 100644 (file)
--- 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 e9644563cb6286ddc99853b8fe270ae5b160d14f..2c5e30d10c198f52c4565e98983ee596565af3fd 100644 (file)
--- 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 258d9bd1620243c34a388a828143c1d3d1240564..9128b6d2bdc7067d191a889db2d1d8f975350e30 100644 (file)
--- 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 b7f4e33725df6570b5aaec6812edb974b3a1024e..a099e40c3fef2b35eb71e0a5da0b05d882065c05 100644 (file)
--- 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 3178fbbff21020126813aa72f2b9478eb9e67b4e..09c3861867b98c0f75fe170a5665b412839f7e48 100644 (file)
--- 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 697e6ae095ff4ce2b038d63747af202d54ce8059..6b65def69cc4567157c144b7bc436433b9db0604 100644 (file)
--- 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 2766c80a9f776348d0188ee4c6882f87e1e8d167..ea11404f19fc6292bf03c7963436bcea14094d77 100644 (file)
--- 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 f9b245e9920955fac03ac1302c7d40a1afe6bc36..a8ec7cab78a5986b1c94a562d44b44729cee3036 100644 (file)
--- 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 7013cab1024b60aa79597ed13cd9b0a76ffd0062..1d440eb0886cd6bc08de220b197141a054529bf3 100644 (file)
--- 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 10016a01b1eafe5a5b721d5ac298e21474a49fe8..c6793fcbc2fc51bc7eba6222026cac172e9d2aa7 100644 (file)
--- 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 99bc56a7502dbcfab441f3d20d607c0cc72ec6fb..fd3618287eb1a5d2f15e8d069685a5a4ded20ead 100644 (file)
--- 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 66ea6dfedf66bfbf2f28fc830535d6c0c82fd57d..5bf14ceec11a163336b1f87c28481b87ae320eb8 100644 (file)
--- 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 8f6cfffcdfec0979d6755d3d66f233acdb42af83..f18dba2764d575a0bcd5b546f6ed3033784cf6ee 100644 (file)
--- 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 411838d53906be1dbeee091566a889345a9fc12f..c1eac5a4c89eaade79eb1460970c0c5363fca8c0 100644 (file)
--- 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 af638ced17c1cb7cc76a5ee5f02b66466acb292d..bf88a246c023632ee63ceec352d18e132b6f82f5 100644 (file)
--- 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 6ce06091fdd78f108eb82dbe48e74d0d5fe15639..85ec6dc672ded1759c5112a7b0b13d35f03514e1 100644 (file)
--- 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 553da1dc6640940fadd1eb5860d056fb848515ec..e784e2b63dedd34011d46d137c71d014e438849a 100644 (file)
--- 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 3763378a6589928e9466961f540296af061aa154..348f87e7b9e801f47198daceab2f9e1cb5dd9156 100644 (file)
--- 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 3763378a6589928e9466961f540296af061aa154..348f87e7b9e801f47198daceab2f9e1cb5dd9156 100644 (file)
--- 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 22c311b0d71023cf419b3cb84b420031d4babc32..27fa5e3c2177e092dfce437d6893d3263fab3bf3 100644 (file)
--- 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 a875e801163aec363351cb4712c5a12c71da978b..dedc03ce2dc7890f3f929b4f619af2b613973229 100644 (file)
--- 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 9b3eb8e3aa1cd0fa376395866aed2b2e6c810336..99aa59c7af93d66c81e681801f601440db824c26 100644 (file)
--- 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 31e571d6bff7c41a41ce739dd86eddc51a43263b..ceaca14ff64f7da419e2fd80fae246d30bc4577d 100644 (file)
--- 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 507a3d3a393717eb5896017f17dc233e6e747185..df7f20a4e7c75d952aeb3294029aa60483aaa628 100644 (file)
--- 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 b01020bb107fed07cab38bf6ee66f07329c6ac3f..f0754309c118379ef58b6042c16ad5d2c8cadea9 100644 (file)
--- 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 5ede853989436c46fee4f1112bb0fa99a0a5baf3..ec4f261500b40875007f00a1ef86829dbe32e8b0 100644 (file)
--- 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 b74f8b1dc5bdb9dd04ea1385447b4746f56c4f26..2c01158e91f0b630c6c7a0c69f57f1dd952ee520 100644 (file)
--- 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 c82e227a4f16b487fa8a2933f0e3e90333c31658..8a9a197706189cd50e3cbc3a91707d389befd0ec 100644 (file)
--- 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 a39dd22f091a1f57ec9039cc5bb083091f3b3c14..a7313b37cf693f94788458d70e34b14a530855cc 100644 (file)
--- 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 c592fe00bf966c1e62b82b89c13d377e1a830936..f2973b48245ed0f62ff530dd1b4bd8ccd1441aa6 100644 (file)
--- 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 d80636f489dd2dc854b910594b07239c8a40ec9f..704443a5e6e9a0b9d8f3e6e4eb89dbeebdf07286 100644 (file)
--- 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 8ef732137cb5550099377ab5b60b04b7ac7292e9..b67c2b1ab71270389d62c78474db7026ff374323 100644 (file)
--- 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 a5044ae9037620466e34c1c2fcad4f2948ff60a3..dee78e92ad470e6d5bcd0bd709b29580b5ace9a7 100644 (file)
--- 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 08fcccb9aaeca4536172bcf72b2d431dd2f6d324..043bab56f8f498b260684429800271ec168ff946 100644 (file)
--- 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 6df1daf4acbd5882abc086aa868cadf7b7f0ad5e..568d2a8d60871403f3aa90d6284c3427f6259930 100644 (file)
--- 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 11ada7b583db354c4958a573eb4685a7d17d8737..af8031a6039b6460f479f9b0c2c4683c10117ae9 100644 (file)
--- 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 1ce2642df97b4a523c6e0402a19f5d9cdd6c817f..1887fb05adff81b570e4caccb6b5efa8e89fdc48 100644 (file)
--- 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 284a52ada4d28766f978b2decab60d03fbafbde0..6b08d0811f51d3db193eca28d278a98db1b24ef8 100644 (file)
--- 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 0ab76a1ea11ba07aaf9ce7f5e8322dac4cf9e77f..07a1d54129421df3f8c183d3c1b4dccf59219927 100644 (file)
--- 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 cde601506fe42d5d7ed66371ec7da353a58da0bc..b3951f93924cb41fe140d1b28ac1755be3c3950a 100644 (file)
--- 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 f7601253d543a895226cf4662188d2660589fdc4..6c4b6aee06605e633952afdf5ec092c7097b1700 100644 (file)
--- 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 ac32ae1e437afdf260b114396bcd7cb16e78c738..1332b6476a3b4613ede8345199177f99bc7928f9 100644 (file)
--- 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 94c54669678a6eb52900102431b7e9c4c2d43987..5ae18255eb9e51e05941b098fd5199e2598ed51c 100644 (file)
--- 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 5a0daec3ce0a48c362a9abb1a3a7945b15cca111..c78ad18a6960c281525335a761462e5cb8399e99 100644 (file)
--- 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 cf887a4f822bfce5f00e426e13a9441829c5f204..c7a1b9ac55e4c4b898cbc1e7f6248a44102566f5 100644 (file)
--- 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 66c26020cd550f857edb55684ec3f94984b300e5..124868bf8e3fdb95123c14f9bb61b3a27dbb3050 100644 (file)
--- 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 c27ffe52f526101f00d0155fe7daac92e634556c..6dcf95d2e7a26fd232e4ff58d93616030756c66f 100644 (file)
--- 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 80458af469fe3e889be8c6b19218f2fd0a2f7856..cf7f9baf7367aa1492503266485f725b39e82a40 100644 (file)
--- 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 e14d5029e6cd0bd7c387d0c81462fcde87fc436f..11b4ccf27eb2de16ccbe9d6d557a38b425aa1613 100644 (file)
--- 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 4be7f587be26f63295eab34606a5d87917d58eca..e23a8fcb416b0904a32767ab07753546e1eee65b 100644 (file)
--- 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 01cb3706d0c003ed028d281ce2a2c6b3ab3a10a1..ea6e682c2ee058d466c77a9e63a5b65fbde87b81 100644 (file)
--- 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 740698bb4009bc5c1c7e21a763b17645ca6d1e60..8c6c777b8d9f1238483a7aecf68b77055c95017a 100644 (file)
--- 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 ad907c661a0422bd45e4e6d04a9b272eb9d53771..87e9657c8254e002ac20cd58444af7a86f45fb91 100644 (file)
--- 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 dcea68e0d2a53db4e6481a708ba7a608309b6479..acfdbd6707ab29cb75af7a29e0fd5e64a7dc2d12 100644 (file)
--- 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 899870ba8696e2d12a1ba04116c14f6e4a2d2f48..182ed263fef61022987f0dcd8cff210e20c00f12 100644 (file)
--- 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 3906cd7516eb1fa58dff36f10bf5daebb43ea141..813bb2f1d41a6d288dcaba0c42e5349009db6af8 100644 (file)
--- 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 22a48218eb09c25b04df50173868dc4c3b830da8..80f47d53134d50ef15cd1bf0fcbfe96009882e84 100644 (file)
--- 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 49613869a7cd09a0200f4de234b31fc42407e1c3..5b473bcf8d2b414e8a663b00977801b5194b7f2c 100644 (file)
--- 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 94d837789839a173cefd0a44760f857185d4f79b..9c17c196e0afc4af1c9481f3eb5717c9a3ce35ff 100644 (file)
--- 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 fac89106fbd0012ca74d438038ef7acf33d05ce2..feb5373a9f592263598e6805f27806c4b102bc59 100644 (file)
--- 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 bef959f233906bd0c81d0d0bd18444330638c0d3..a00d640d3276b2c6057a5ba712dadfaff22f43f7 100644 (file)
--- 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 91b391b8c5459263f75bd22802401642f0abeeb2..39b510aa43705c81f1a844e8ef6ea8ed54f09725 100644 (file)
--- 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 646677d15a0d2cf9fb4b8fa6e9c57a0cfc4d7e6d..10f0efd839ff656024bd6df6d23ce28308d8ad4f 100644 (file)
--- 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 460abe42f1fca797225f655224800fb743b77039..37af7583459657dcfa73de46020f9553a9edd979 100644 (file)
--- 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 a7f6b3fe8e888c9d22f67c184afd031f9d10e1ca..b76db7c90b895f510f076298509bddc6a1e52fbb 100644 (file)
--- 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 12efdf0a6be03678f0f00f5c50b64668db96f365..b51c1eac3899a76e45669ccb2c63251b7445198a 100644 (file)
--- 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 0f7213459435a6c975598bcb0e740a4586490f91..b438ff4ae4eb1f42d4bc3026604e621516a8a54c 100644 (file)
--- 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 b28747dcbe3f5cefa244eea2ea78dbf7978c5dda..7e6a2d4d0b184f709dd929e0114d950e273c21e6 100644 (file)
--- 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 b72b3fb82d84036c8b8667688beaf7f82702401a..f6ff39a2977d5ac54d4418d77e5ba87ee04cf875 100644 (file)
--- 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 c1e6149a98eba2659a5a15b7941a48c9839ab84d..17ab4d046645e86cec4468a45895d7c73e2194a4 100644 (file)
--- 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 e5021dac56078dea86e5ad0df06c23fd56754c9f..9a018a3df9dbdada862d8315ed2121cc55ce5d7f 100644 (file)
--- 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 340cd9ad2f3e4c7c159b4153ee728011560d8734..02551cecd6c075849823de5a881155ca18658b34 100644 (file)
--- 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 954039730adca5d106851c4498558ed79b12f3ae..f6a16a208defdaffd1f46d0fc581378830fd7752 100644 (file)
--- 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 47e067bf71b7a7523ddc3649bf3faf2ecefa0191..8ce52a91fced83dee07d28eb2cc482fcf9d8fa9f 100644 (file)
--- 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 0f422e6e4ed42fd245bc88487792ff2834009159..b7cc1f42a302395eb312ded1251af0be08afae95 100644 (file)
--- 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 f99031ce980d28159e981ae72824d9e82189263a..ce9a161bafd5722ae13dfbf0f7c3a65f82fea952 100644 (file)
--- 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 c61167b4565ac327814e56875169403a1c65ba00..7208e904a739134a9b781a4d6975c21b497af11f 100644 (file)
--- 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 fbe9128b5a89b2dbe6203aebb06c8613e53e37c1..719241d4f62ed0562be1c315d65970fd8fe4c108 100644 (file)
--- 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 f6d07e8606beb1506294ca44a416438d34dadd67..8c4a6167fcaaacd9e39b5b95bc24cf10d6f3dfd3 100644 (file)
--- 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 c8874e7b7c9b2ce8430c21eaf97ea2e2597c4a2f..6c631b318cb85502c35e2bcba442ccd78bbe80bb 100644 (file)
--- 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 5f244d6f22135fdaab3a19cb12cff73e752e8944..af038e423f5cf4c24bd7c38267872084bae72ee7 100644 (file)
--- 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 ae02d77fd493e3a5f571b28f2e401e2f7d3eb17f..ad39d9027dc57deab22f2d9247c6f04d46db7da0 100644 (file)
--- 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 56d4bda5535639ae1bf14c0cd91a02af124a26cc..6a8f07af51e2039f9fed7c4bd728e9dd2eb918a5 100644 (file)
--- 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 1ac077a6fe2a91d88d256b22188325dcdc8a8bd6..6d820fe1ff974a855b4e093e681e5b2e3d30cec7 100644 (file)
--- 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 544a0b8d33018b4e572cce54cf6fb319406c4d07..c34591641756067554e4876c872b56dfc9f341dc 100644 (file)
--- 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 e8bc701753a53aeffcfa8711fbbbfbb33d04f963..760a5cda9f1b9e8eea4e28e484fa0ce6c630717f 100644 (file)
--- 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 7fd731a1ff444a301c762c91bb817706718038be..34567465d544e36f6378a92cdcf98d0a09f3966b 100644 (file)
--- 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 cdaf348bf15510762ba4557fdf2b0a9cd03c844f..495e933dd1ee4d452b92f143b0a98c4a36b24255 100644 (file)
--- 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 e709709f9513e833e09d9a910a698633be446a77..323c89dd811113f6e9c07aadbc76bafa2c96f253 100644 (file)
--- 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 a8c7c7b7db8290a8defdc3fee310e99dc4caaf6b..8fb585c52ad7cb93e0d8617ae1c0d924b15b6ada 100644 (file)
--- 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 65ec69b4e26a0122ee6585ed568231119d373c30..57659e4ed772252dc9674d65af052955efc80bda 100644 (file)
--- 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 8ec28b71da755cab95182e3f7bc535fbea19e383..f44f6f3e0ebd7c41e3bcc9ec16866d0a985cb1f6 100644 (file)
--- 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 dd67d2790068ca6566c0a6ac450aa0b6b3451507..9f7391e393c06eba404431e385ffdc0bfbfb9fb0 100644 (file)
--- 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 caa3d7683ee960e64ee0d1ee044ebddbc9220a04..d73ca516d60b5d67f4e3b02c1d944a1b2ac483cb 100644 (file)
--- 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 52228efb77d49f3a20d5b042dfc06cb688e657ee..beb3a2f08244e103596edfa9c12524d0fa41faab 100644 (file)
--- 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 9770c9abad7da8114ad3ce7cbebfbf64bf3aeaf1..42c08c450ac467341c7288873cd8e68746da1b0b 100644 (file)
--- 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 b3bde5f209c7a9c858645611698d9af27d28b81e..20f39fb736b8c0a7fc6bdf8d255b98acbaa9e1e9 100644 (file)
--- 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 ac53b812ffde8fe877b6284ae08ea42fbdaff1cc..905f7d301272f9857e6f49e11213f6a9ccd69795 100644 (file)
--- 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 19ac9abe88377358c883685c9f5ec94d0495efbd..bfe4cd8cd37fcb1c1de402e86e5c79ea1eb05518 100644 (file)
--- 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 970dbd439347d43957298a16945fb5d01a189d53..b91e4d9b00dd83722648ffdf5d3ebb88ea4109e3 100644 (file)
--- 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 d3013120dc4b2ab95c0c473bf371d7619c2ce7f3..11ad66f151e8e7da64c8ac2087f55786cdd8a441 100644 (file)
--- 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 42204027bdc5f4b9a39e284165913f7dfc360b59..70fa5b819021cce0ecf5d51e786ce76e977eeee6 100644 (file)
--- 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 b923306b9b8e07cb0ee063e192c9564fedef6e47..1b7d363db4fccbaf8c0260c41894c0893ce19661 100644 (file)
--- 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 9ed674e27470248984556c245dab326f5ca48ee6..b130ab9aa1d7c4dc702bf13084e7f5a46370bb09 100644 (file)
--- 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 33ec59de3b62fda0e5aa3ace3fa3a6ca34adb4f0..1d3829a2d050a61f9f0f6070b5426aa0896e6740 100644 (file)
--- 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 d569b31446f91684fc5a3da2e4192f3b2661c1d2..aa92936945a958bf1bfca982854946f18d9a87af 100644 (file)
--- 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 3f7cb45607c1b2a91f36650cbdd6198e0de329cb..3ec33d79805675ed3f36af33d13e7ba8999c8138 100644 (file)
--- 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 d1fdcd276f23059fa7220ab129107c96de1aefdb..c9293c282874466feec227d4279ab907b4d402a6 100644 (file)
--- 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 dabf689bececa7168033d0de0ca235a1fcd2e4eb..ac936d5816ed1881a36f27b7811a79b4222a4f8b 100644 (file)
--- 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 5b4cd670cf7df56e30ed412008335026cad35d29..9c912480786c045cc6b1818993fcfb27c6fbc41f 100644 (file)
--- 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 745f0c1bc7827ca55ec9e1b76ed4a61f3e761451..e7b0c2d09b8fc41290940f65567889495faba144 100644 (file)
--- 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 e6ce66824ddaa61135253c8ea9ebdd08799abff8..3fb4e6eef888854e3847540eb87927fde153f51e 100644 (file)
--- 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 b9fcc0fb7fb31a95a5070befd232cc7d628d4cd0..2949a2feab17811dd56f04d6000f55ca26e55999 100644 (file)
--- 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 938ac11ada6321c12e52fc3b890e5dedb027cd41..3a12a9be12d4694e9897ab78d7b6064813ba168c 100644 (file)
--- 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 26ce60d6aa8c71551d39077de36b1cc27ef2bdbb..6582ed26b8b37e46aecca5919dabe28b20a79758 100644 (file)
--- 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 3c29828f8046f4bbde56621f12c8501e399b77c6..f7abc4cd8bf0366b324038048bdba04a447432fd 100644 (file)
--- 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 a75ccd559fb9c84251d7736e6b1fcff91ff1cb3d..56f65b2bc7de2cc81f0d497bb9e6426c9a13b076 100644 (file)
--- 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 cededdbf7aaffb78227d88f796f301130eec3823..64756ff308ad08141197f095453946cf4522d9e4 100644 (file)
--- 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 5e97f8130cc355ee728cee15276c3914aee1a30d..5ef2363889bec6626aa3931788d67ff6881dff41 100644 (file)
--- 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 aa1af2213bf855690c12ef3d2686603f65df7f4b..d26f98e23de1d4c0a34fb00968624ae63369b66c 100644 (file)
--- 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 0ca822db0130b97f631286091f7e8b1c4f9ccdcb..0c9d84c72133441c988ab5ae1abee4e777bb0683 100644 (file)
--- 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 45ca369177f29f7d53003786e21957e926ed1d3f..be34dde208177f3055e577febadff09edf51f6e9 100644 (file)
--- 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 2fb673fe913a55e404606f2f8a0077a4272c5529..cee07c4ac7acf469e49d1dee487af9aae0e24d82 100644 (file)
--- 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 fd46de47361e766777bbd93de33919a93861f3ed..c4d007cfb080ca65620115a2d4166430341a345b 100644 (file)
--- 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 19c8a1ca04ff2566473c747d400c3c36fe706e51..a4cac58840728c00c5536a74b54f5c58bf93296f 100644 (file)
--- 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 6ec839d8f0cd203ae3fe1adbcfbd2f9466d23ba8..c97899f204085bd7857e656ec7ddebd7855c1ce2 100644 (file)
--- 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 476158a53c0744b92ca72c364b7f08a5020a8dfe..e370d21c053077bc0e49c569bb4910218a9557b6 100644 (file)
--- 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 11930e51a8a5b7af9f5a03f0f8be1e1d734b510e..f41ae26884b9f791649f85bf04e346c00f740027 100644 (file)
--- 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 0774995171535cce0d6d0380d40a22505e645503..1f544eab662f266299d1a3f79943fa8401571399 100644 (file)
--- 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 f76825611d0b86226461c6c4bfbbf7b868d7c1c8..0bd1a11d4e3bfa9032d1159d77ee27d75496b2dc 100644 (file)
--- 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 7e08f8a43615e614ba4d394c3c87a6280ce9d0a8..7c324b0f6619af861a8b288f648d20bfb3223282 100644 (file)
--- 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()