Remove more unnecessary imports from test scripts.

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

diff --git a/test/AR/AR.py b/test/AR/AR.py
index 2c0b1ae747168a775336722e7cbbd84420d0278f..41105da9bbe8a87d6fdf8bb834ba073709506f23 100644 (file)
--- a/test/AR/AR.py
+++ b/test/AR/AR.py
@@ -26,7 +26,7 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os
 import string
-import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_

diff --git a/test/AR/ARFLAGS.py b/test/AR/ARFLAGS.py
index 087cefeb345d51053a0a55c25a50cc61ea375122..87346599bfbafc164bb0fff66c2fb71c0766a3fe 100644 (file)
--- a/test/AR/ARFLAGS.py
+++ b/test/AR/ARFLAGS.py
@@ -26,7 +26,7 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os
 import string
-import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_

diff --git a/test/AS/ASCOM.py b/test/AS/ASCOM.py
index c2468066e28ac20191c711448d49e62ecc44346c..1be592c3c1e702e36462c228c1d4e969f5a60aa3 100644 (file)
--- a/test/AS/ASCOM.py
+++ b/test/AS/ASCOM.py
@@ -29,7 +29,7 @@ Test the ability to configure the $ASCOM construction variable.
 """
 
 import os
-import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_

diff --git a/test/AS/ASCOMSTR.py b/test/AS/ASCOMSTR.py
index f1f64ee3b272ffa4f0338df7cf3a71c7b87c07d0..eaa344a4f7f6a3d569536bbff18a911cdc7bc303 100644 (file)
--- a/test/AS/ASCOMSTR.py
+++ b/test/AS/ASCOMSTR.py
@@ -30,7 +30,7 @@ the assembly output.
 """
 
 import os
-import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_

diff --git a/test/AS/ASFLAGS.py b/test/AS/ASFLAGS.py
index d7b7c33c74dd2d1414daec28dda9c50e09f74ec1..5581b07cee2eceedefbf99c24555df6cebca2c18 100644 (file)
--- a/test/AS/ASFLAGS.py
+++ b/test/AS/ASFLAGS.py
@@ -24,8 +24,8 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-import string
 import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_

diff --git a/test/AS/ASPP.py b/test/AS/ASPP.py
index cb9d8dd915bf59943335f1d65b28bd19b2ef0c20..d8fb3be52a6808a261949391dbfbc09a77383391 100644 (file)
--- a/test/AS/ASPP.py
+++ b/test/AS/ASPP.py
@@ -24,8 +24,8 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-import string
 import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_

diff --git a/test/AS/ASPPCOM.py b/test/AS/ASPPCOM.py
index b3c04a9f387017cc1d5960a69b7d8849ed6ad107..53f4addfde30b6fbda25c4d9fecd9765eca57273 100644 (file)
--- a/test/AS/ASPPCOM.py
+++ b/test/AS/ASPPCOM.py
@@ -28,7 +28,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 Test the ability to configure the $ASPPCOM construction variable.
 """
 
-import sys
 import TestSCons
 
 _python_ = TestSCons._python_

diff --git a/test/AS/ASPPCOMSTR.py b/test/AS/ASPPCOMSTR.py
index 0e612ad95369f497f8e70345d75e638794d8a504..20e3de00ea336e60b960d837247424cdd07eb39a 100644 (file)
--- a/test/AS/ASPPCOMSTR.py
+++ b/test/AS/ASPPCOMSTR.py
@@ -30,7 +30,7 @@ the displayed assembler string.
 """
 
 import string
-import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_

diff --git a/test/AS/ASPPFLAGS.py b/test/AS/ASPPFLAGS.py
index b8fdf2ebd376cc9ee7648ed7838d1d49831c2b74..e306c227413ca76c24a7c49dbcb2a8c808bb47a0 100644 (file)
--- a/test/AS/ASPPFLAGS.py
+++ b/test/AS/ASPPFLAGS.py
@@ -24,8 +24,8 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-import string
 import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_

diff --git a/test/AS/ml.py b/test/AS/ml.py
index af7fc176a232910aa66e34ee6547807bcb8e9b50..a731efb26965b54f7801f917bca6d55bf757b641 100644 (file)
--- a/test/AS/ml.py
+++ b/test/AS/ml.py
@@ -28,7 +28,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 Verify correct use of the live 'ml' assembler.
 """
 
-import os
 import string
 import sys
 

diff --git a/test/Actions/actions.py b/test/Actions/actions.py
index 79da3858977c2f4d625f46abf22ff4173815c765..aae2bb9185369a71d131bb503478a97643b8d9ed 100644 (file)
--- a/test/Actions/actions.py
+++ b/test/Actions/actions.py
@@ -24,7 +24,6 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-import sys
 import TestSCons
 
 _python_ = TestSCons._python_

diff --git a/test/Actions/addpost-link.py b/test/Actions/addpost-link.py
index 0a94c7d0e1dba39309740079551985f551672236..9c79662813f0e0ddd451e1fb460ed98fe2a5f61b 100644 (file)
--- a/test/Actions/addpost-link.py
+++ b/test/Actions/addpost-link.py
@@ -32,8 +32,6 @@ This is a test for fix of Issue 1004, reported by Matt Doar and
 packaged by Gary Oberbrunner.
 """
 
-import string
-
 import TestSCons
 
 _python_ = TestSCons._python_

diff --git a/test/Actions/pre-post.py b/test/Actions/pre-post.py
index 9ea397f075b6c25ea2c3c2d2f6c40bf52ee3b59c..e09ee028d038766a2cc351eb263dc34b97ea78d8 100644 (file)
--- a/test/Actions/pre-post.py
+++ b/test/Actions/pre-post.py
@@ -29,7 +29,7 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os
 import stat
-import sys
+
 import TestSCons
 
 _exe = TestSCons._exe

diff --git a/test/Alias/Alias.py b/test/Alias/Alias.py
index 73cffc4d07759ef42557a0cf8c650eb0cc66c18d..a5dd9037c9b6fc25e3c138225980758bc247b1a3 100644 (file)
--- a/test/Alias/Alias.py
+++ b/test/Alias/Alias.py
@@ -25,7 +25,7 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os
-import sys
+
 import TestSCons
 import TestCmd
 

diff --git a/test/Alias/Depends.py b/test/Alias/Depends.py
index bba0abd4ce294fd3f3cab96194c9295d8f5bca72..a1129e478cf59bd7b28c8b191a82d58cf437b434 100644 (file)
--- a/test/Alias/Depends.py
+++ b/test/Alias/Depends.py
@@ -25,7 +25,7 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os
-import sys
+
 import TestSCons
 import TestCmd
 

diff --git a/test/CC/CCCOM.py b/test/CC/CCCOM.py
index 474a930dda501e917edd112d24f7ce272c9af69b..6634e15ac0e1d62bb2a3c9e582ff103f1811c09e 100644 (file)
--- a/test/CC/CCCOM.py
+++ b/test/CC/CCCOM.py
@@ -29,7 +29,7 @@ Test the ability to configure the $CCCOM construction variable.
 """
 
 import os
-import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_

diff --git a/test/CC/CCCOMSTR.py b/test/CC/CCCOMSTR.py
index f24f6c742b77b0b15bdda9069f7a982a8ce1cd16..f66a192dc71ad813603a60d5109eca96810036bb 100644 (file)
--- a/test/CC/CCCOMSTR.py
+++ b/test/CC/CCCOMSTR.py
@@ -30,7 +30,7 @@ the C compilation output.
 """
 
 import os
-import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_

diff --git a/test/CC/SHCC.py b/test/CC/SHCC.py
index db03d20ad5b546a2c7dfb6cd5c0385e23609faa2..f80dfe5a76c277722855761a6f102cb46dfc9f8e 100644 (file)
--- a/test/CC/SHCC.py
+++ b/test/CC/SHCC.py
@@ -26,7 +26,7 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os
 import string
-import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_

diff --git a/test/CC/SHCCCOM.py b/test/CC/SHCCCOM.py
index 44184b453e118feffff3eb21aa1eb25c1629cb7e..ab61035cb48521f4b4dd3764eafc062e4596c745 100644 (file)
--- a/test/CC/SHCCCOM.py
+++ b/test/CC/SHCCCOM.py
@@ -25,7 +25,7 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os
-import sys
+
 import TestSCons
 
 """

diff --git a/test/CC/SHCCCOMSTR.py b/test/CC/SHCCCOMSTR.py
index c8daaf6c8f466f1d34f66c469f0aefe59aa260d0..05c27ad477652832d074c68efc99c9d753988e94 100644 (file)
--- a/test/CC/SHCCCOMSTR.py
+++ b/test/CC/SHCCCOMSTR.py
@@ -30,7 +30,7 @@ the shared object C compilation output.
 """
 
 import os
-import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_

diff --git a/test/CFILESUFFIX.py b/test/CFILESUFFIX.py
index 1cce9e959c8351aacb1b359fc5c6dfe8a6777a90..e167155b5a19bb92e1b92ec60992a3fd7c20d9e9 100644 (file)
--- a/test/CFILESUFFIX.py
+++ b/test/CFILESUFFIX.py
@@ -29,8 +29,7 @@ Verify that we can set CFILESUFFIX to arbitrary values.
 """
 
 import os
-import string
-import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_

diff --git a/test/CPPFLAGS.py b/test/CPPFLAGS.py
index 4c594e5c4b9175002487a2486dd3ff88730517f9..346b4229b80d5bca23d09deb93a29609df6cdf11 100644 (file)
--- a/test/CPPFLAGS.py
+++ b/test/CPPFLAGS.py
@@ -46,8 +46,6 @@ if sys.platform == 'win32':
 if sys.platform == 'win32':
 
     test.write('mylink.py', r"""
-import getopt
-import os
 import sys
 args = sys.argv[1:]
 while args:
@@ -68,7 +66,6 @@ else:
 
     test.write('mylink.py', r"""
 import getopt
-import os
 import sys
 opts, args = getopt.getopt(sys.argv[1:], 'o:s:')
 for opt, arg in opts:

diff --git a/test/CXX/CXXCOM.py b/test/CXX/CXXCOM.py
index be1bec49ef760763d2af1a7b3055f66b670cc3e3..f623eaf29b11e448f305ef8c337a547359cfb8f2 100644 (file)
--- a/test/CXX/CXXCOM.py
+++ b/test/CXX/CXXCOM.py
@@ -28,7 +28,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 Test the ability to configure the $CXXCOM construction variable.
 """
 
-import sys
 import TestSCons
 
 _python_ = TestSCons._python_

diff --git a/test/CXX/CXXFILESUFFIX.py b/test/CXX/CXXFILESUFFIX.py
index 7d5609b424fb10eb0d962106492a58a79a856162..749ca69dc9b43da23a1eb94751bce53083fd24cc 100644 (file)
--- a/test/CXX/CXXFILESUFFIX.py
+++ b/test/CXX/CXXFILESUFFIX.py
@@ -25,8 +25,7 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os
-import string
-import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_

diff --git a/test/CXX/SHCXX.py b/test/CXX/SHCXX.py
index 6c03b8f84b6ed637c4d1cdf6eefd986f9684a169..6351cfe50de83f1ad44455935a594e5d804df4ee 100644 (file)
--- a/test/CXX/SHCXX.py
+++ b/test/CXX/SHCXX.py
@@ -26,7 +26,7 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os
 import string
-import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_

diff --git a/test/CXX/SHCXXCOM.py b/test/CXX/SHCXXCOM.py
index 972dad0a72a577b6da671eb61ad222ceb8508eca..7c5e45f283868ac26ddf9c6e0c7e326efb616448 100644 (file)
--- a/test/CXX/SHCXXCOM.py
+++ b/test/CXX/SHCXXCOM.py
@@ -28,7 +28,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 Test the ability to configure the $SHCXXCOM construction variable.
 """
 
-import sys
 import TestSCons
 
 _python_ = TestSCons._python_

diff --git a/test/CXX/SHCXXCOMSTR.py b/test/CXX/SHCXXCOMSTR.py
index b9f20a8b77ec24bd0c4dcc4ca24b89a1df687ea2..afe647a8fb405d548bfdce1118573ff07476fb82 100644 (file)
--- a/test/CXX/SHCXXCOMSTR.py
+++ b/test/CXX/SHCXXCOMSTR.py
@@ -29,7 +29,6 @@ Test that the $SHCXXCOMSTR construction variable allows you to customize
 the shared object C++ compilation output.
 """
 
-import sys
 import TestSCons
 
 _python_ = TestSCons._python_

diff --git a/test/Command.py b/test/Command.py
index ada2ae49b21a7f252cce214244c9161fa426b063..f3be46ae3be8e2ae06d02358168ed7cc6bdffe05 100644 (file)
--- a/test/Command.py
+++ b/test/Command.py
@@ -24,7 +24,6 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-import sys
 import TestSCons
 
 python = TestSCons.python

diff --git a/test/CommandGenerator.py b/test/CommandGenerator.py
index 9348bddb4096ccbd86ed9797b61af9790de65ffe..063999dfa1b8b6f3a18efd51f5c730529699b358 100644 (file)
--- a/test/CommandGenerator.py
+++ b/test/CommandGenerator.py
@@ -25,7 +25,7 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os.path
-import sys
+
 import TestSCons
 
 python = TestSCons.python

diff --git a/test/D/DMD.py b/test/D/DMD.py
index fd761828603081f2ac19cccb8942695ba5462a0e..497b6c5b67db067b29fb2467c00faa8501a94318 100644 (file)
--- a/test/D/DMD.py
+++ b/test/D/DMD.py
@@ -24,8 +24,6 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-import os
-
 import TestSCons
 
 _exe = TestSCons._exe

diff --git a/test/DVIPDF/DVIPDF.py b/test/DVIPDF/DVIPDF.py
index 5317d5c111ed8e772867a1efec54eee63e1cfd2f..b366152596861efebb07a872b9621ebfc7f43f12 100644 (file)
--- a/test/DVIPDF/DVIPDF.py
+++ b/test/DVIPDF/DVIPDF.py
@@ -24,7 +24,6 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-import os
 import string
 
 import TestSCons

diff --git a/test/DVIPDF/DVIPDFFLAGS.py b/test/DVIPDF/DVIPDFFLAGS.py
index 7d7079ccb03d6455f9b239c1b3401a33210320c5..3d7bc72ec486fcbaf67b914342730adca433d035 100644 (file)
--- a/test/DVIPDF/DVIPDFFLAGS.py
+++ b/test/DVIPDF/DVIPDFFLAGS.py
@@ -24,7 +24,6 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-import os
 import string
 
 import TestSCons

diff --git a/test/DVIPS/DVIPS.py b/test/DVIPS/DVIPS.py
index 84821a3af8474599fa429b2b6da31cbde3d63d84..7d32c973f9f6ff72f583ee5d0d7e4b07ba1148fa 100644 (file)
--- a/test/DVIPS/DVIPS.py
+++ b/test/DVIPS/DVIPS.py
@@ -24,7 +24,6 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-import os
 import string
 
 import TestSCons

diff --git a/test/DVIPS/DVIPSFLAGS.py b/test/DVIPS/DVIPSFLAGS.py
index de8322db13bb1e87e14cdd5434b2e9602957cf9a..61d247a6c24873866d1fef3092693cbd318817de 100644 (file)
--- a/test/DVIPS/DVIPSFLAGS.py
+++ b/test/DVIPS/DVIPSFLAGS.py
@@ -24,7 +24,6 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-import os
 import string
 
 import TestSCons

diff --git a/test/Default.py b/test/Default.py
index 1b456610ca4c1b3cfa6fa4c0832744c9daa7fd6e..b8ccce27b53237629f4af2652ed76f148347a1b5 100644 (file)
--- a/test/Default.py
+++ b/test/Default.py
@@ -29,7 +29,7 @@ Verify various combinations of arguments to Default() work properly.
 """
 
 import os
-import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_

diff --git a/test/Deprecated/BuildDir.py b/test/Deprecated/BuildDir.py
index 26987cef6355b12af6c9a54f87312edd93bfc6d0..02ef1397864d2d1131fb9cd2e084b8d48a292715 100644 (file)
--- a/test/Deprecated/BuildDir.py
+++ b/test/Deprecated/BuildDir.py
@@ -85,7 +85,6 @@ SConscript('../build/var6/SConscript', "env")
 
 test.subdir(['work1', 'src'])
 test.write(['work1', 'src', 'SConscript'], """
-import os
 import os.path
 
 def buildIt(target, source, env):

diff --git a/test/ENV.py b/test/ENV.py
index f6d10129b9707cb698f4509e24b071c95796e828..dc97ec82c29554fb5e5304f3a430dc2f5a8eb82c 100644 (file)
--- a/test/ENV.py
+++ b/test/ENV.py
@@ -25,7 +25,6 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os
-import sys
 
 import TestSCons
 

diff --git a/test/Environment.py b/test/Environment.py
index 18a75dd3d3636825769dfb6f39949906e5d9648e..52b6488e4ca617dcd7f38f60bc1817ea92675204 100644 (file)
--- a/test/Environment.py
+++ b/test/Environment.py
@@ -25,7 +25,6 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import TestSCons
-import sys
 
 _python_ = TestSCons._python_
 

diff --git a/test/IDL/midl.py b/test/IDL/midl.py
index bf4f58cf9168b69b48f7b481675305014ea46c49..e716cacc63cb56c53a07bb00bf234269335c2174 100644 (file)
--- a/test/IDL/midl.py
+++ b/test/IDL/midl.py
@@ -24,12 +24,12 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-import TestSCons
-import sys
 import os
-import TestCmd
+import sys
 
-test = TestSCons.TestSCons(match = TestCmd.match_re)
+import TestSCons
+
+test = TestSCons.TestSCons(match = TestSCons.match_re)
 
 if sys.platform != 'win32':
     msg = "Skipping test on non-Windows platform '%s'\n" % sys.platform
@@ -39,7 +39,6 @@ if sys.platform != 'win32':
 # Test the basics
 
 test.write('SConstruct',"""
-import os.path
 import os
 
 env = Environment(CPPPATH = '${TARGET.dir}',
@@ -56,8 +55,6 @@ SConscript(os.path.join('build2','SConscript'))
 test.subdir('src','build')
 
 test.write('src/SConscript',"""
-import os.path
-
 Import('env')
 
 local = env.Clone(WINDOWS_INSERT_DEF = 1)

diff --git a/test/Java/JAR.py b/test/Java/JAR.py
index ca12ae4c1e6b67a5c6962f6ff7178cccd68a2882..b0b193e94b6fb014eecffa15bbf3aab5fa0e01d4 100644 (file)
--- a/test/Java/JAR.py
+++ b/test/Java/JAR.py
@@ -26,7 +26,7 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os
 import string
-import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_

diff --git a/test/Java/JAVAC.py b/test/Java/JAVAC.py
index bb823fce5a203cc5865708bbcbd28142b20cdc79..06b19697ab65e5db09c7ed2917ae225cd3aa9988 100644 (file)
--- a/test/Java/JAVAC.py
+++ b/test/Java/JAVAC.py
@@ -29,7 +29,6 @@ Test setting the JAVAC variable.
 """
 
 import os
-import sys
 
 import TestSCons
 

diff --git a/test/Java/RMIC.py b/test/Java/RMIC.py
index 0abf5a4e59f1b1836f04c3275ea4e16566c09602..5b6cf5fbbcd7eba801d928f0eb353abb6400a8bb 100644 (file)
--- a/test/Java/RMIC.py
+++ b/test/Java/RMIC.py
@@ -26,7 +26,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os
 import string
-import sys
 
 import TestSCons
 

diff --git a/test/LEX/LEX.py b/test/LEX/LEX.py
index 7964063b4ab88bacd35f2d787274127219db2ea8..0ead71ac125778967b1e721bb256847602e23b0e 100644 (file)
--- a/test/LEX/LEX.py
+++ b/test/LEX/LEX.py
@@ -25,8 +25,7 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os
-import string
-import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_

diff --git a/test/LEX/LEXFLAGS.py b/test/LEX/LEXFLAGS.py
index 7d7aff1717fc1a76d42dde1e68df12aa62248c8e..aaabdf04f097b243a5da7fbe09d600930365c0a0 100644 (file)
--- a/test/LEX/LEXFLAGS.py
+++ b/test/LEX/LEXFLAGS.py
@@ -25,8 +25,7 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os
-import string
-import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_

diff --git a/test/LINK/LINK.py b/test/LINK/LINK.py
index 851ddc9dba6cad3a866be97eb9358267e10de456..21e2d66c499c07940f04e0effe4127789a647b72 100644 (file)
--- a/test/LINK/LINK.py
+++ b/test/LINK/LINK.py
@@ -26,7 +26,7 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os
 import string
-import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_

diff --git a/test/LINK/LINKCOMSTR.py b/test/LINK/LINKCOMSTR.py
index 045574cddb88d286d75877a13a0e48cebf7e6ba4..7e12c1df3f63f7a117b5a7b9b2b9417d17e0a3ec 100644 (file)
--- a/test/LINK/LINKCOMSTR.py
+++ b/test/LINK/LINKCOMSTR.py
@@ -30,7 +30,7 @@ the displayed linker string.
 """
 
 import string
-import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_

diff --git a/test/LINK/LINKFLAGS.py b/test/LINK/LINKFLAGS.py
index 78385f1b25e7bebc1cbb094a71592f6db6d626a7..172670903b745f41cdd8e507643114fe004e281f 100644 (file)
--- a/test/LINK/LINKFLAGS.py
+++ b/test/LINK/LINKFLAGS.py
@@ -26,7 +26,7 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os
 import string
-import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_

diff --git a/test/LINK/SHLINK.py b/test/LINK/SHLINK.py
index c9be8bf8b8bf14d7824bd21eec606647f80d36d5..2bd9bd61866c230857fbbdb0338d675b8b6c8060 100644 (file)
--- a/test/LINK/SHLINK.py
+++ b/test/LINK/SHLINK.py
@@ -26,7 +26,7 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os
 import string
-import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_

diff --git a/test/LINK/SHLINKCOM.py b/test/LINK/SHLINKCOM.py
index 23b049c2997d328a6e367a68d9b743086400871b..c507d316dfbee8d3c2e36c6d20cb87608ac6bd26 100644 (file)
--- a/test/LINK/SHLINKCOM.py
+++ b/test/LINK/SHLINKCOM.py
@@ -28,7 +28,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 Test the ability to configure the $SHLINKCOM construction variable.
 """
 
-import sys
 import TestSCons
 
 _python_ = TestSCons._python_

diff --git a/test/LINK/SHLINKFLAGS.py b/test/LINK/SHLINKFLAGS.py
index 924fafd712f774d901183afe919214fe73899f6a..ddd1a6c4d25d08a47ac89c5ce99e05cb4ccf5ce3 100644 (file)
--- a/test/LINK/SHLINKFLAGS.py
+++ b/test/LINK/SHLINKFLAGS.py
@@ -26,7 +26,7 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os
 import string
-import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_

diff --git a/test/M4/M4.py b/test/M4/M4.py
index 9f877ee57e89465919f8de9a837ff40e19f12040..d12bb2863c0e4a32ed0dfcda6220a99de0ca4fa9 100644 (file)
--- a/test/M4/M4.py
+++ b/test/M4/M4.py
@@ -30,7 +30,7 @@ Test that $M4 and $M4FLAGS work as expected.
 
 import os
 import string
-import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_

diff --git a/test/MSVC/batch.py b/test/MSVC/batch.py
index bc65f8292b8443f2e4c3a4901a1f67d3e72e98a1..0ab116c7a00785deecf8c8a3e2151c63899a8ff3 100644 (file)
--- a/test/MSVC/batch.py
+++ b/test/MSVC/batch.py
@@ -32,8 +32,6 @@ explicit suffix settings so that the test should work when run on any
 platform.
 """
 
-import string
-
 import TestSCons
 
 test = TestSCons.TestSCons()

diff --git a/test/MSVC/msvc.py b/test/MSVC/msvc.py
index 21e88d0f3af4c98a1363ca42b159c1147ca09b4a..c8fa8dcbacb57b2bd4522d3158d130ff6690d9e0 100644 (file)
--- a/test/MSVC/msvc.py
+++ b/test/MSVC/msvc.py
@@ -29,7 +29,6 @@ Verify basic invocation of Microsoft Visual C/C++, including use
 of a precompiled header with the $CCFLAGS variable.
 """
 
-import os
 import sys
 import time
 

diff --git a/test/PRINT_CMD_LINE_FUNC.py b/test/PRINT_CMD_LINE_FUNC.py
index 45a741c0bd1df4337b6740dcbb4faa28156602c2..faa51ace7200f1df54bec111edf10a74c997c25c 100644 (file)
--- a/test/PRINT_CMD_LINE_FUNC.py
+++ b/test/PRINT_CMD_LINE_FUNC.py
@@ -28,14 +28,12 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 Test the PRINT_CMD_LINE_FUNC construction variable.
 """
 
-import sys
-import TestCmd
 import TestSCons
 
 _exe = TestSCons._exe
 _obj = TestSCons._obj
 
-test = TestSCons.TestSCons(match = TestCmd.match_re)
+test = TestSCons.TestSCons(match = TestSCons.match_re)
 
 
 test.write('SConstruct', r"""

diff --git a/test/QT/QTFLAGS.py b/test/QT/QTFLAGS.py
index 87dcaf02d302228f987ce564d30839725d361676..2537c80c0d8982d8c1b7657cb1e13c0c4ba1bf91 100644 (file)
--- a/test/QT/QTFLAGS.py
+++ b/test/QT/QTFLAGS.py
@@ -29,7 +29,6 @@ Testing the configuration mechanisms of the 'qt' tool.
 """
 
 import TestSCons
-import os.path
 
 _python_ = TestSCons._python_
 _exe = TestSCons._exe

diff --git a/test/RANLIB/RANLIB.py b/test/RANLIB/RANLIB.py
index eefbd157ac0a54c662436ffe8d321e45578c7d41..ecc6482d033a2ecf179825de01012b11016de0cd 100644 (file)
--- a/test/RANLIB/RANLIB.py
+++ b/test/RANLIB/RANLIB.py
@@ -26,7 +26,7 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os
 import string
-import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_

diff --git a/test/RANLIB/RANLIBFLAGS.py b/test/RANLIB/RANLIBFLAGS.py
index 45fcc00cce3e80e5dfeb2afe0411e84794e003e6..123d403a8f6ba6fe0fce6bfbc5c06ddee8543a72 100644 (file)
--- a/test/RANLIB/RANLIBFLAGS.py
+++ b/test/RANLIB/RANLIBFLAGS.py
@@ -26,7 +26,7 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os
 import string
-import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_

diff --git a/test/Repository/M4.py b/test/Repository/M4.py
index b6c9736081bedfba4e7347a51a9a891d015728da..b3ed75566d37245a1cc480797ab9902f60172741 100644 (file)
--- a/test/Repository/M4.py
+++ b/test/Repository/M4.py
@@ -29,8 +29,7 @@ Test that $M4 and $M4FLAGS work with repositories.
 """
 
 import os
-import string
-import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_

diff --git a/test/Rpcgen/RPCGEN.py b/test/Rpcgen/RPCGEN.py
index 7430ba73b29a2f15b3e4db9e340cc23b36d96247..e8a7a1ff3ec7b1453991f71cdf06a4b829c53757 100644 (file)
--- a/test/Rpcgen/RPCGEN.py
+++ b/test/Rpcgen/RPCGEN.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/Rpcgen/RPCGENCLIENTFLAGS.py b/test/Rpcgen/RPCGENCLIENTFLAGS.py
index 7da011199bd4347923a3ca497688f04d48cad440..4b0d24f551eb669056ef0be0d7a2cc6c7e21f1ae 100644 (file)
--- a/test/Rpcgen/RPCGENCLIENTFLAGS.py
+++ b/test/Rpcgen/RPCGENCLIENTFLAGS.py
@@ -24,9 +24,6 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-import string
-import sys
-
 import TestSCons
 
 _python_ = TestSCons._python_

diff --git a/test/Rpcgen/RPCGENFLAGS.py b/test/Rpcgen/RPCGENFLAGS.py
index 8f70adf9c1752a56a2dbbd656bd1bfc66a1fc679..ddbc745df352403e5f651135b5ac40e659318f82 100644 (file)
--- a/test/Rpcgen/RPCGENFLAGS.py
+++ b/test/Rpcgen/RPCGENFLAGS.py
@@ -24,9 +24,6 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-import string
-import sys
-
 import TestSCons
 
 _python_ = TestSCons._python_

diff --git a/test/Rpcgen/RPCGENHEADERFLAGS.py b/test/Rpcgen/RPCGENHEADERFLAGS.py
index 840973fa9a5c696a2d927265a8c2d63452a7d185..3eac78f6712654b6acd0b7c6b3bea99d7fe2d659 100644 (file)
--- a/test/Rpcgen/RPCGENHEADERFLAGS.py
+++ b/test/Rpcgen/RPCGENHEADERFLAGS.py
@@ -24,9 +24,6 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-import string
-import sys
-
 import TestSCons
 
 _python_ = TestSCons._python_

diff --git a/test/Rpcgen/RPCGENSERVICEFLAGS.py b/test/Rpcgen/RPCGENSERVICEFLAGS.py
index db8f354d38bedf9cb2edb9b289a4d6d8d46d711b..eee45053797e6181a3be409465147214221a93d3 100644 (file)
--- a/test/Rpcgen/RPCGENSERVICEFLAGS.py
+++ b/test/Rpcgen/RPCGENSERVICEFLAGS.py
@@ -24,9 +24,6 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-import string
-import sys
-
 import TestSCons
 
 _python_ = TestSCons._python_

diff --git a/test/Rpcgen/RPCGENXDRFLAGS.py b/test/Rpcgen/RPCGENXDRFLAGS.py
index d185bcf89d324867522181963fb86813cd3e1665..c9a911adc7f888e4d683339c0bfbe012fbbfaa23 100644 (file)
--- a/test/Rpcgen/RPCGENXDRFLAGS.py
+++ b/test/Rpcgen/RPCGENXDRFLAGS.py
@@ -24,9 +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 f2d1955511f84a51e34fb0758b1bb8aec02a92ae..5a695106fef8339d3cb69fa7393f715e78ecd382 100644 (file)
--- a/test/Scanner/generated.py
+++ b/test/Scanner/generated.py
@@ -34,8 +34,6 @@ factors triggered the bug Scott saw, and partly because the real-world
 complexity is valuable in its own right.
 """
 
-import sys
-
 import TestSCons
 
 test = TestSCons.TestSCons()
@@ -53,10 +51,7 @@ test.write('SConstruct', """\
 ###
 
 experimenttop = r"%s"
-
 import os
-import os.path
-import string
 import Mylib
 
 BStaticLibMerge = Builder(generator = Mylib.Gen_StaticLibMerge)

diff --git a/test/TAR/TAR.py b/test/TAR/TAR.py
index f56a5e95de88cbd9243b19eb593587f2520214c5..80dea7a1d88d58b24b263f7f718935f7fa0bcf8e 100644 (file)
--- a/test/TAR/TAR.py
+++ b/test/TAR/TAR.py
@@ -26,7 +26,7 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os
 import string
-import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_

diff --git a/test/TAR/TARCOM.py b/test/TAR/TARCOM.py
index fcf4588734611b2ce08b4e1f6258cce53a8b300d..2a98d064469593bd0dd054ed5eb5442694ea3b46 100644 (file)
--- a/test/TAR/TARCOM.py
+++ b/test/TAR/TARCOM.py
@@ -28,8 +28,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 Test the ability to configure the $TARCOM construction variable.
 """
 
-import sys
-
 import TestSCons
 
 _python_ = TestSCons._python_

diff --git a/test/TAR/TARFLAGS.py b/test/TAR/TARFLAGS.py
index 40031ce641746c65cd75476ceb78bee4c47b4ef9..e9940a85e54a6b719ebd6659cbdb4ac3fb12ebdd 100644 (file)
--- a/test/TAR/TARFLAGS.py
+++ b/test/TAR/TARFLAGS.py
@@ -26,7 +26,7 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os
 import string
-import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_

diff --git a/test/TEX/LATEX.py b/test/TEX/LATEX.py
index a45b032b0c25f6d0d7e98b38d5bf0fa4a99554c4..fff98dfede993d61a61bd9712904069cbc4ee114 100644 (file)
--- a/test/TEX/LATEX.py
+++ b/test/TEX/LATEX.py
@@ -30,9 +30,8 @@ the produced .dvi, .aux and .log files get removed by the -c option,
 and that we can use this to wrap calls to the real latex utility.
 """
 
-import os
 import string
-import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_

diff --git a/test/TEX/LATEX2.py b/test/TEX/LATEX2.py
index 9e4145c0d71a2147ea2ac6bb77f2e57668089b99..8f4eaac27b5614f8bab95872933509a88538f9a2 100644 (file)
--- a/test/TEX/LATEX2.py
+++ b/test/TEX/LATEX2.py
@@ -28,8 +28,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 Validate that we can produce several .pdf at once from several sources.
 """
 
-import os
-
 import TestSCons
 
 _python_ = TestSCons._python_

diff --git a/test/TEX/LATEXCOM.py b/test/TEX/LATEXCOM.py
index 81ab3debed7e5ea6cb409a9c3a81d01b5af90551..9d65134fc16239e7613a5d367e4f63a28ff1b7e2 100644 (file)
--- a/test/TEX/LATEXCOM.py
+++ b/test/TEX/LATEXCOM.py
@@ -28,8 +28,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 Test the ability to configure the $LATEXCOM construction variable.
 """
 
-import sys
-
 import TestSCons
 
 _python_ = TestSCons._python_

diff --git a/test/TEX/LATEXCOMSTR.py b/test/TEX/LATEXCOMSTR.py
index 0a212fe8a99ed72d2f2f64cb6bd243efd23f41e2..9383e8785adaf8633aa6b6b872fda984b68c8d12 100644 (file)
--- a/test/TEX/LATEXCOMSTR.py
+++ b/test/TEX/LATEXCOMSTR.py
@@ -29,8 +29,6 @@ Test that the $LATEXCOMSTR construction variable allows you to configure
 the C compilation output.
 """
 
-import sys
-
 import TestSCons
 
 _python_ = TestSCons._python_

diff --git a/test/TEX/LATEXFLAGS.py b/test/TEX/LATEXFLAGS.py
index ff1bf5265d7e49ef607e1a5214ff5a05cca87ee6..8c4e7074fe00847408c1484180b86c5d712fcb40 100644 (file)
--- a/test/TEX/LATEXFLAGS.py
+++ b/test/TEX/LATEXFLAGS.py
@@ -26,7 +26,7 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os
 import string
-import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_

diff --git a/test/TEX/PDFLATEX.py b/test/TEX/PDFLATEX.py
index 1d7f4499d6338a2dcd1f28f44f688e9b91be2a59..a7e68aacfc68b690c05020db3725be1c2ff0a502 100644 (file)
--- a/test/TEX/PDFLATEX.py
+++ b/test/TEX/PDFLATEX.py
@@ -30,9 +30,8 @@ the produced .dvi, .aux and .log files get removed by the -c option,
 and that we can use this to wrap calls to the real latex utility.
 """
 
-import os
 import string
-import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_

diff --git a/test/TEX/PDFLATEXCOM.py b/test/TEX/PDFLATEXCOM.py
index b05052ac000f5b8f7307ff5b74cf1443f9563526..36372a8022f473235172b0fe6653de11690fe30d 100644 (file)
--- a/test/TEX/PDFLATEXCOM.py
+++ b/test/TEX/PDFLATEXCOM.py
@@ -28,8 +28,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 Test the ability to configure the $PDFLATEXCOM construction variable.
 """
 
-import sys
-
 import TestSCons
 
 _python_ = TestSCons._python_

diff --git a/test/TEX/PDFLATEXCOMSTR.py b/test/TEX/PDFLATEXCOMSTR.py
index 2e9ba8a7759369d1013ce1ee63c76ac2e2579f48..e91ba87336a6a221592a25c512403de3526dfd7b 100644 (file)
--- a/test/TEX/PDFLATEXCOMSTR.py
+++ b/test/TEX/PDFLATEXCOMSTR.py
@@ -30,8 +30,6 @@ Test that the $PDFLATEXCOMSTR construction variable allows you to configure
 the C compilation output.
 """
 
-import sys
-
 import TestSCons
 
 _python_ = TestSCons._python_

diff --git a/test/TEX/PDFLATEXFLAGS.py b/test/TEX/PDFLATEXFLAGS.py
index f007277f74675759faf546c6de7eac2fe606b1ad..19c7e5a95449709ac2b11edad135297f6b91147b 100644 (file)
--- a/test/TEX/PDFLATEXFLAGS.py
+++ b/test/TEX/PDFLATEXFLAGS.py
@@ -26,7 +26,7 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os
 import string
-import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_

diff --git a/test/TEX/PDFTEX.py b/test/TEX/PDFTEX.py
index 61fac1e9bf3f16fa5a83422069b70ca72be16fc4..1562b20d601dcc0da560ef25576a36b5a07ef5f1 100644 (file)
--- a/test/TEX/PDFTEX.py
+++ b/test/TEX/PDFTEX.py
@@ -30,9 +30,8 @@ the produced .dvi, .aux and .log files get removed by the -c option,
 and that we can use this to wrap calls to the real latex utility.
 """
 
-import os
 import string
-import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_

diff --git a/test/TEX/PDFTEXCOM.py b/test/TEX/PDFTEXCOM.py
index b6b58753010e5253a47fcf276bc3f7b1bcb2c93e..6d57f2c24a6c52e0ba8238e2681037cc4f3cbe6d 100644 (file)
--- a/test/TEX/PDFTEXCOM.py
+++ b/test/TEX/PDFTEXCOM.py
@@ -28,8 +28,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 Test the ability to configure the $PDFTEXCOM construction variable.
 """
 
-import sys
-
 import TestSCons
 
 _python_ = TestSCons._python_

diff --git a/test/TEX/PDFTEXCOMSTR.py b/test/TEX/PDFTEXCOMSTR.py
index e1fbc5c8deff5f9eda0aca880c8504f8ac9612e3..8caa4e379b581193179db1471fedb618c9cb9db4 100644 (file)
--- a/test/TEX/PDFTEXCOMSTR.py
+++ b/test/TEX/PDFTEXCOMSTR.py
@@ -30,8 +30,6 @@ Test that the $PDFTEXCOMSTR construction variable allows you to configure
 the C compilation output.
 """
 
-import sys
-
 import TestSCons
 
 _python_ = TestSCons._python_

diff --git a/test/TEX/PDFTEXFLAGS.py b/test/TEX/PDFTEXFLAGS.py
index eb78ec8f52d0ee861261a7ad6986383800c2d7c8..d1b82fe0f8d6da5f7558f22ca3a095d99a3c55f9 100644 (file)
--- a/test/TEX/PDFTEXFLAGS.py
+++ b/test/TEX/PDFTEXFLAGS.py
@@ -26,7 +26,7 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os
 import string
-import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_

diff --git a/test/TEX/TEX.py b/test/TEX/TEX.py
index 3b2a6bece8c64df8d5518aa21887169d7cfd03ea..99a69fe58e11d66d0c9bec9fea6de03c65be0dfd 100644 (file)
--- a/test/TEX/TEX.py
+++ b/test/TEX/TEX.py
@@ -30,9 +30,8 @@ the produced .dvi, .aux and .log files get removed by the -c option,
 and that we can use this to wrap calls to the real latex utility.
 """
 
-import os
 import string
-import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_

diff --git a/test/TEX/TEXCOM.py b/test/TEX/TEXCOM.py
index 0224341bc7f3fd2a8d625ee51bd7548f61f58a4a..6336730e06503e3e57f35a130b7a8bb76daf5f69 100644 (file)
--- a/test/TEX/TEXCOM.py
+++ b/test/TEX/TEXCOM.py
@@ -28,8 +28,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 Test the ability to configure the $TEXCOM construction variable.
 """
 
-import sys
-
 import TestSCons
 
 _python_ = TestSCons._python_

diff --git a/test/TEX/TEXCOMSTR.py b/test/TEX/TEXCOMSTR.py
index 6c0e1f9da7d3a04d3f875db1b25b12077e382156..d4ebe57390538b1120baaeed5992a8924fc648bc 100644 (file)
--- a/test/TEX/TEXCOMSTR.py
+++ b/test/TEX/TEXCOMSTR.py
@@ -29,8 +29,6 @@ Test that the $TEXCOMSTR construction variable allows you to configure
 the C compilation output.
 """
 
-import sys
-
 import TestSCons
 
 _python_ = TestSCons._python_

diff --git a/test/TEX/TEXFLAGS.py b/test/TEX/TEXFLAGS.py
index 1f9a2e1eb28d1406b9c024ac7a0e211031f915de..efb66061a288d2bb14491690bc4258efadd174b8 100644 (file)
--- a/test/TEX/TEXFLAGS.py
+++ b/test/TEX/TEXFLAGS.py
@@ -26,7 +26,7 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os
 import string
-import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_

diff --git a/test/TEX/dryrun.py b/test/TEX/dryrun.py
index bf1088f60f4bce69f28793b5a9f4d490103c2455..adbc0b6ac7b4bbdde56b9967029319059a7085ff 100644 (file)
--- a/test/TEX/dryrun.py
+++ b/test/TEX/dryrun.py
@@ -30,8 +30,6 @@ the produced .dvi, .aux and .log files get removed by the -c option,
 and that we can use this to wrap calls to the real latex utility.
 """
 
-import os
-
 import TestSCons
 
 _python_ = TestSCons._python_

diff --git a/test/TEX/rename_result.py b/test/TEX/rename_result.py
index 678d6da84214224caa38e2525e9ee7f8d1475d11..0f098d08c8e12041e28d07ebd60e226623371001 100644 (file)
--- a/test/TEX/rename_result.py
+++ b/test/TEX/rename_result.py
@@ -29,8 +29,6 @@ Validate that we can rename the output from latex to the
 target name provided by the user.
 """
 
-import os
-
 import TestSCons
 
 _python_ = TestSCons._python_

diff --git a/test/TEX/usepackage.py b/test/TEX/usepackage.py
index 136864c860deaa71cf35d6c3af09a932fdf8b1d3..aa7e79f54d384c17e0d50bdfc932aeaf1c082554 100644 (file)
--- a/test/TEX/usepackage.py
+++ b/test/TEX/usepackage.py
@@ -30,8 +30,6 @@ the produced .dvi, .aux and .log files get removed by the -c option,
 and that we can use this to wrap calls to the real latex utility.
 """
 
-import os
-
 import TestSCons
 
 _python_ = TestSCons._python_

diff --git a/test/Value.py b/test/Value.py
index f4ed21952f4782c95b03a9231d7de72198404406..9f0645ecb267c8f0d7df60cd3f7e476358052979 100644 (file)
--- a/test/Value.py
+++ b/test/Value.py
@@ -25,7 +25,6 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import re
-import sys
 
 import TestSCons
 import TestCmd

diff --git a/test/VariantDir/VariantDir.py b/test/VariantDir/VariantDir.py
index f2c0a7c9d0baa475aa5f07eb8f2c9cc4d2c9611f..396f6a9f2bb92d13956a628a36a682a6a90a3072 100644 (file)
--- a/test/VariantDir/VariantDir.py
+++ b/test/VariantDir/VariantDir.py
@@ -25,7 +25,7 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import string
-import sys
+
 import TestSCons
 
 _exe = TestSCons._exe
@@ -91,7 +91,6 @@ SConscript('../build/var6/SConscript', "env")
 
 test.subdir(['work1', 'src'])
 test.write(['work1', 'src', 'SConscript'], """
-import os
 import os.path
 
 def buildIt(target, source, env):

diff --git a/test/YACC/YACC.py b/test/YACC/YACC.py
index c0a0f347b771c664d5934da65f0c21232c86a430..a9ef57cb89c24611fdbec1e01d66502ac9f67c61 100644 (file)
--- a/test/YACC/YACC.py
+++ b/test/YACC/YACC.py
@@ -25,8 +25,8 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os
-import string
 import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_

diff --git a/test/YACC/YACCFLAGS.py b/test/YACC/YACCFLAGS.py
index e0f5e5ae6dcd581228fdac4b4f9bfa73cb3b70bf..f36cb944cece26e491bf78cf308900adbd361ddd 100644 (file)
--- a/test/YACC/YACCFLAGS.py
+++ b/test/YACC/YACCFLAGS.py
@@ -25,8 +25,8 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os
-import string
 import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_

diff --git a/test/ZIP/ZIP.py b/test/ZIP/ZIP.py
index fffb493bd5c050541d905fb26431d8e33bb2b7d6..60f3dad1f6bc862668df1b93a558f8e4acf6bc0e 100644 (file)
--- a/test/ZIP/ZIP.py
+++ b/test/ZIP/ZIP.py
@@ -27,7 +27,7 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 import os
 import stat
 import string
-import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_

diff --git a/test/ZIP/ZIPCOM.py b/test/ZIP/ZIPCOM.py
index c1f6761c25c4dc5282983c66ef299df152409aa8..6c78824e85891d8b1e33ac9f908ef8a692142a14 100644 (file)
--- a/test/ZIP/ZIPCOM.py
+++ b/test/ZIP/ZIPCOM.py
@@ -28,8 +28,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 Test the ability to configure the $ZIPCOM construction variable.
 """
 
-import sys
-
 import TestSCons
 
 _python_ = TestSCons._python_

diff --git a/test/builderrors.py b/test/builderrors.py
index 733b539f81fd42f8a5744baacaa24a3a30d853b9..72b856f3f235da06676cc649c409222e2f879e38 100644 (file)
--- a/test/builderrors.py
+++ b/test/builderrors.py
@@ -25,7 +25,6 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os
-import sys
 
 import TestSCons
 

diff --git a/test/exceptions.py b/test/exceptions.py
index 12a343092dc49fbb64a571618e91b06ed5877b47..6a68c79a6031089a10f571cc77997620eebccb6e 100644 (file)
--- a/test/exceptions.py
+++ b/test/exceptions.py
@@ -25,14 +25,12 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import re
-import sys
 
-import TestCmd
 import TestSCons
 
 _python_ = TestSCons._python_
 
-test = TestSCons.TestSCons(match = TestCmd.match_re_dotall)
+test = TestSCons.TestSCons(match = TestSCons.match_re_dotall)
 
 SConstruct_path = test.workpath('SConstruct')
 

diff --git a/test/explain/basic.py b/test/explain/basic.py
index 93d761b5ee269459c7c63d4cd0cd2daaf510c080..881f01d44c153a6b8dbe12f693805df6b53dab41 100644 (file)
--- a/test/explain/basic.py
+++ b/test/explain/basic.py
@@ -30,7 +30,6 @@ Verify a lot of the basic operation of the --debug=explain option.
 
 import os
 import string
-import sys
 
 import TestSCons
 

diff --git a/test/file-names.py b/test/file-names.py
index b7fd043e13740b5c18c5916d739ed0f9028a1b06..95b4e4ecba63303ed9a55b2cc54abc6c01641df7 100644 (file)
--- a/test/file-names.py
+++ b/test/file-names.py
@@ -24,7 +24,6 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-import sys
 import TestSCons
 
 test = TestSCons.TestSCons()

diff --git a/test/ignore-command.py b/test/ignore-command.py
index 0b5429a7371bc01fc361f3f8aa665fa96430cafd..1343145590b6e11c5f20c9f09aa469888e9e33c5 100644 (file)
--- a/test/ignore-command.py
+++ b/test/ignore-command.py
@@ -29,7 +29,7 @@ Test use of a preceding - to ignore the return value from a command.
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os
-import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_

diff --git a/test/implicit/IMPLICIT_COMMAND_DEPENDENCIES.py b/test/implicit/IMPLICIT_COMMAND_DEPENDENCIES.py
index 272be146d66d35c271f4a7aad3485493b1b48e46..8e391c1ac6a9a0f01d6363bfe1ae99b48a1ae5c8 100644 (file)
--- a/test/implicit/IMPLICIT_COMMAND_DEPENDENCIES.py
+++ b/test/implicit/IMPLICIT_COMMAND_DEPENDENCIES.py
@@ -30,8 +30,6 @@ whether or not the implicit dependency on executed commands
 is added to targets.
 """
 
-import os
-
 import TestSCons
 
 python = TestSCons.python

diff --git a/test/multiline.py b/test/multiline.py
index 18fc9b59c3d9132d2a6cd67e33c0a2809a46ba75..18b2f21eadd4e4b92e46c5484ee89defa4daaba3 100644 (file)
--- a/test/multiline.py
+++ b/test/multiline.py
@@ -25,7 +25,7 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os.path
-import sys
+
 import TestSCons
 
 python = TestSCons.python

diff --git a/test/option--.py b/test/option--.py
index 78bb8d229b3392e7db2bb0834ceed1c66d6a4365..3c932c06b9ad4a306485850254c1fc31263c4e04 100644 (file)
--- a/test/option--.py
+++ b/test/option--.py
@@ -25,7 +25,6 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os.path
-import sys
 
 import TestSCons
 

diff --git a/test/option--Q.py b/test/option--Q.py
index 46a047ec3a0ba474ad4cbfe9f514997b27a49595..4322bcd04d158bb9b0ac0c9a84453d1b2ae2bb38 100644 (file)
--- a/test/option--Q.py
+++ b/test/option--Q.py
@@ -25,7 +25,6 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os.path
-import sys
 
 import TestSCons
 

diff --git a/test/option--max-drift.py b/test/option--max-drift.py
index 87a5ffe59b2c49ee4c3fe1e871708faaaef6a031..08fafd1961821fccb870f45f728c5e6125fc5332 100644 (file)
--- a/test/option--max-drift.py
+++ b/test/option--max-drift.py
@@ -25,7 +25,7 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os
-import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_

diff --git a/test/option-c.py b/test/option-c.py
index 6ea4e58aea3abd426c550b6e79cd9d732a667038..e71c7c2bfdd49e1601fc6fb5999a285d23f46404 100644 (file)
--- a/test/option-c.py
+++ b/test/option-c.py
@@ -29,7 +29,6 @@ Test various uses of the -c (clean) option.
 """
 
 import os
-import sys
 
 import TestSCons
 

diff --git a/test/option-i.py b/test/option-i.py
index a1b3a98f29b39dbeaf63e078c23be3489f677d23..b32bd9cdd15ae8b9617a43a1a3dae3b2fba3827c 100644 (file)
--- a/test/option-i.py
+++ b/test/option-i.py
@@ -25,7 +25,7 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os.path
-import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_

diff --git a/test/option-j.py b/test/option-j.py
index 316340e54b7d9bc150cdaed47c0bb6c85e9cde0d..83597cafbef17ef783584392b8f4bd17f9797966 100644 (file)
--- a/test/option-j.py
+++ b/test/option-j.py
@@ -31,7 +31,7 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os.path
 import string
-import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_

diff --git a/test/option-k.py b/test/option-k.py
index 588b3310f4c314496646160f9756a930a43b4361..a367c653468c77ed59a7d6af4e5c770c14c7e7c3 100644 (file)
--- a/test/option-k.py
+++ b/test/option-k.py
@@ -25,7 +25,7 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os.path
-import sys
+
 import TestSCons
 
 _python_ = TestSCons._python_

diff --git a/test/option-n.py b/test/option-n.py
index 6fb80580404b743b5db3dfd7a4e08fa8c75f3f73..abb02845172caeecbe60a3677f18ab8a57a8bc9f 100644 (file)
--- a/test/option-n.py
+++ b/test/option-n.py
@@ -41,9 +41,7 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os
 import re
-import sys
 
-import TestCmd
 import TestSCons
 
 _python_ = TestSCons._python_
@@ -170,7 +168,7 @@ test.fail_test(os.path.exists(test.workpath('build', 'f4.in')))
 
 # test Configure-calls in conjunction with -n
 test.subdir('configure')
-test.match_func = TestCmd.match_re_dotall
+test.match_func = TestSCons.match_re_dotall
 test.write('configure/SConstruct',
 """def CustomTest(context):
     def userAction(target,source,env):

diff --git a/test/option-s.py b/test/option-s.py
index c875495ce56d3674e3868bc485f2280d8cad1e5a..6950fc9867944a8d61ee702ebf0524638428b98f 100644 (file)
--- a/test/option-s.py
+++ b/test/option-s.py
@@ -25,7 +25,6 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os.path
-import sys
 
 import TestSCons
 

diff --git a/test/option/debug-time.py b/test/option/debug-time.py
index edd3ea5e49ba4bcc27e4262e2c282aed09dd76b1..d9ca23720613bba34978e08e944a550f8878fbb9 100644 (file)
--- a/test/option/debug-time.py
+++ b/test/option/debug-time.py
@@ -25,7 +25,6 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import TestSCons
-import sys
 import string
 import re
 import time

diff --git a/test/option/md5-chunksize.py b/test/option/md5-chunksize.py
index 43faf933bef20db46997bf518c3080213324805e..9d15e8411c0a41c06697d1d628e42cff6911bde6 100644 (file)
--- a/test/option/md5-chunksize.py
+++ b/test/option/md5-chunksize.py
@@ -25,7 +25,6 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import string
-import sys
 
 import TestSCons
 

diff --git a/test/packaging/msi/package.py b/test/packaging/msi/package.py
index 0de241ed849cc8b7ac1afe17f3de1bd3906bee01..4988742da3c0950382a40e7622170154f7e236cc 100644 (file)
--- a/test/packaging/msi/package.py
+++ b/test/packaging/msi/package.py
@@ -51,8 +51,6 @@ test.write( 'file1.exe', "file1" )
 test.write( 'file2.exe', "file2" )
 
 test.write('SConstruct', """
-import os
-
 env  = Environment(tools=['default', 'packaging'])
 
 f1  = env.Install( '/usr/' , 'file1.exe'  )
@@ -96,7 +94,6 @@ test.write( 'file4.dll', "file4" )
 test.write( 'file5.dll', "file5" )
 
 test.write('SConstruct', """
-import os
 env = Environment(tools=['default', 'packaging'])
 f1  = env.Install( '/usr/' , 'file1.exe'  )
 f2  = env.Install( '/usr/' , 'file2.exe'  )

diff --git a/test/sconsign/script/SConsignFile.py b/test/sconsign/script/SConsignFile.py
index 2bf1d078e7618b6aa8a57345432ac29de92c7f0e..e974c67cc5ee0f4aa9ff18efc420aff1473e9c37 100644 (file)
--- a/test/sconsign/script/SConsignFile.py
+++ b/test/sconsign/script/SConsignFile.py
@@ -29,7 +29,6 @@ Verify that the sconsign script works with files generated when
 using the signatures in an SConsignFile().
 """
 
-import os
 import re
 
 import TestSCons

diff --git a/test/silent-command.py b/test/silent-command.py
index a5d03d6dc252018cd10bc058390169a4bbc74be5..7704ee599fdc68d93d22f60fd2e72b9c60d25d26 100644 (file)
--- a/test/silent-command.py
+++ b/test/silent-command.py
@@ -29,7 +29,6 @@ Test the use of a preceding @ to suppress printing a command.
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os
-import sys
 
 import TestSCons
 

diff --git a/test/site_scons/sys-path.py b/test/site_scons/sys-path.py
index fda7230744977b3c5777554169292385a73b91c3..46f84c76a3f101272e7e4b46a2e94100235ed9f6 100644 (file)
--- a/test/site_scons/sys-path.py
+++ b/test/site_scons/sys-path.py
@@ -44,13 +44,11 @@ print "Imported site_scons/testmod2.py."
 """)
 
 test.write(['sub1', 'SConscript'], """
-import sys
 import testmod2 # This call did not work before the fix
 
 """)
 
 test.write('SConstruct', """
-import sys
 import testmod1 # this always worked
 SConscript('sub1/SConscript')
 """)

diff --git a/test/special-filenames.py b/test/special-filenames.py
index 91bb51710ad87b7ed73326772347b834d4cf872a..86a6e59c6bc0555f3ba0e554d1ebd0bad705e97a 100644 (file)
--- a/test/special-filenames.py
+++ b/test/special-filenames.py
@@ -25,7 +25,6 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import string
-import sys
 
 import TestSCons