From: stevenknight Date: Fri, 6 Feb 2009 18:36:10 +0000 (+0000) Subject: Remove (lots) more unnecessary imports. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c1be825e6af5ffa0dc7d5c8ece458f0e166dda5a;p=scons.git 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 42925814..6ad7e6e2 100644 --- a/test/AS/ASCOM.py +++ b/test/AS/ASCOM.py @@ -29,7 +29,6 @@ Test the ability to configure the $ASCOM construction variable. """ import os -import string import sys import TestSCons diff --git a/test/AS/ASCOMSTR.py b/test/AS/ASCOMSTR.py index 287da160..d146229c 100644 --- a/test/AS/ASCOMSTR.py +++ b/test/AS/ASCOMSTR.py @@ -30,7 +30,6 @@ the assembly output. """ import os -import string import sys import TestSCons diff --git a/test/AS/ASFLAGS.py b/test/AS/ASFLAGS.py index a0da9ffb..7297620d 100644 --- a/test/AS/ASFLAGS.py +++ b/test/AS/ASFLAGS.py @@ -24,7 +24,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" -import os import string import sys import TestSCons diff --git a/test/AS/ASPP.py b/test/AS/ASPP.py index 2045a3d6..f2c3e44f 100644 --- a/test/AS/ASPP.py +++ b/test/AS/ASPP.py @@ -24,7 +24,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" -import os import string import sys import TestSCons diff --git a/test/AS/ASPPCOM.py b/test/AS/ASPPCOM.py index bb330dcd..6f2bde5d 100644 --- a/test/AS/ASPPCOM.py +++ b/test/AS/ASPPCOM.py @@ -28,8 +28,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" Test the ability to configure the $ASPPCOM construction variable. """ -import os -import string import sys import TestSCons diff --git a/test/AS/ASPPCOMSTR.py b/test/AS/ASPPCOMSTR.py index 1956154c..37a61df7 100644 --- a/test/AS/ASPPCOMSTR.py +++ b/test/AS/ASPPCOMSTR.py @@ -29,7 +29,6 @@ Test that the $ASPPCOMSTR construction variable allows you to customize the displayed assembler string. """ -import os import string import sys import TestSCons diff --git a/test/AS/ASPPFLAGS.py b/test/AS/ASPPFLAGS.py index 27858bdb..2410435c 100644 --- a/test/AS/ASPPFLAGS.py +++ b/test/AS/ASPPFLAGS.py @@ -24,7 +24,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" -import os import string import sys import TestSCons diff --git a/test/Actions/append.py b/test/Actions/append.py index fa3bb640..4b13107f 100644 --- a/test/Actions/append.py +++ b/test/Actions/append.py @@ -51,7 +51,6 @@ int main(void) """) test.write('SConstruct', """ -import os.path env=Environment() diff --git a/test/Actions/pre-post.py b/test/Actions/pre-post.py index 674c628a..647b6e98 100644 --- a/test/Actions/pre-post.py +++ b/test/Actions/pre-post.py @@ -28,7 +28,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" import os -import os.path import stat import sys import TestSCons diff --git a/test/AddOption/basic.py b/test/AddOption/basic.py index 57ee11e2..b41b63a8 100644 --- a/test/AddOption/basic.py +++ b/test/AddOption/basic.py @@ -29,8 +29,6 @@ Verify the help text when the AddOption() function is used (and when it's not). """ -import string - import TestSCons test = TestSCons.TestSCons() diff --git a/test/AddOption/optional-arg.py b/test/AddOption/optional-arg.py index f7a03378..2bf849e3 100644 --- a/test/AddOption/optional-arg.py +++ b/test/AddOption/optional-arg.py @@ -29,8 +29,6 @@ Verify use of the nargs='?' keyword argument to specify a long command-line option with an optional argument value. """ -import string - import TestSCons test = TestSCons.TestSCons() diff --git a/test/Alias/action.py b/test/Alias/action.py index ea0eac2d..263df3cd 100644 --- a/test/Alias/action.py +++ b/test/Alias/action.py @@ -28,10 +28,7 @@ Test that Aliases with actions work. __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" -import os -import sys import TestSCons -import TestCmd test = TestSCons.TestSCons() diff --git a/test/Alias/errors.py b/test/Alias/errors.py index 36876c44..964bae40 100644 --- a/test/Alias/errors.py +++ b/test/Alias/errors.py @@ -24,10 +24,7 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" -import os -import sys import TestSCons -import TestCmd test = TestSCons.TestSCons() diff --git a/test/Alias/scanner.py b/test/Alias/scanner.py index 3ce14dde..b6254e92 100644 --- a/test/Alias/scanner.py +++ b/test/Alias/scanner.py @@ -28,10 +28,7 @@ Test that an Alias of a node with a Scanner works. __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" -import os -import sys import TestSCons -import TestCmd test = TestSCons.TestSCons() diff --git a/test/AlwaysBuild.py b/test/AlwaysBuild.py index d1f07fd5..5b59ae4e 100644 --- a/test/AlwaysBuild.py +++ b/test/AlwaysBuild.py @@ -26,7 +26,7 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" import os -import sys + import TestSCons test = TestSCons.TestSCons() diff --git a/test/CC/CCCOM.py b/test/CC/CCCOM.py index ca13ec81..9cc5430c 100644 --- a/test/CC/CCCOM.py +++ b/test/CC/CCCOM.py @@ -29,7 +29,6 @@ Test the ability to configure the $CCCOM construction variable. """ import os -import string import sys import TestSCons diff --git a/test/CC/CCCOMSTR.py b/test/CC/CCCOMSTR.py index 50ddb5ad..bd54a153 100644 --- a/test/CC/CCCOMSTR.py +++ b/test/CC/CCCOMSTR.py @@ -30,7 +30,6 @@ the C compilation output. """ import os -import string import sys import TestSCons diff --git a/test/CC/SHCCCOM.py b/test/CC/SHCCCOM.py index 5606fd03..695ad591 100644 --- a/test/CC/SHCCCOM.py +++ b/test/CC/SHCCCOM.py @@ -25,7 +25,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" import os -import string import sys import TestSCons diff --git a/test/CC/SHCCCOMSTR.py b/test/CC/SHCCCOMSTR.py index 562961a7..31a46c47 100644 --- a/test/CC/SHCCCOMSTR.py +++ b/test/CC/SHCCCOMSTR.py @@ -30,7 +30,6 @@ the shared object C compilation output. """ import os -import string import sys import TestSCons diff --git a/test/CFILESUFFIX.py b/test/CFILESUFFIX.py index 08c40c29..a8c44a6b 100644 --- a/test/CFILESUFFIX.py +++ b/test/CFILESUFFIX.py @@ -29,7 +29,6 @@ Verify that we can set CFILESUFFIX to arbitrary values. """ import os -import os.path import string import sys import TestSCons diff --git a/test/CPPFLAGS.py b/test/CPPFLAGS.py index 1aaf4a3b..a8212963 100644 --- a/test/CPPFLAGS.py +++ b/test/CPPFLAGS.py @@ -24,9 +24,8 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" -import os -import string import sys + import TestSCons _python_ = TestSCons._python_ diff --git a/test/CPPSUFFIXES.py b/test/CPPSUFFIXES.py index 305cf044..6133bdf4 100644 --- a/test/CPPSUFFIXES.py +++ b/test/CPPSUFFIXES.py @@ -35,7 +35,6 @@ _python_ = TestSCons._python_ test = TestSCons.TestSCons() test.write('mycc.py', r""" -import string import sys def do_file(outf, inf): for line in open(inf, 'rb').readlines(): diff --git a/test/CVS.py b/test/CVS.py index c21d9ad3..510539cc 100644 --- a/test/CVS.py +++ b/test/CVS.py @@ -29,7 +29,6 @@ Test fetching source files from CVS. """ import os -import os.path import TestSCons diff --git a/test/CXX/CXXCOM.py b/test/CXX/CXXCOM.py index 5fc40d05..64e4a50f 100644 --- a/test/CXX/CXXCOM.py +++ b/test/CXX/CXXCOM.py @@ -28,8 +28,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" Test the ability to configure the $CXXCOM construction variable. """ -import os -import string import sys import TestSCons diff --git a/test/CXX/CXXCOMSTR.py b/test/CXX/CXXCOMSTR.py index df4a87b7..e738533e 100644 --- a/test/CXX/CXXCOMSTR.py +++ b/test/CXX/CXXCOMSTR.py @@ -29,9 +29,6 @@ Test that the $CXXCOMSTR construction variable allows you to configure the C++ compilation output. """ -import os -import string -import sys import TestSCons _python_ = TestSCons._python_ diff --git a/test/CXX/CXXFILESUFFIX.py b/test/CXX/CXXFILESUFFIX.py index d2a70c3a..f74ec848 100644 --- a/test/CXX/CXXFILESUFFIX.py +++ b/test/CXX/CXXFILESUFFIX.py @@ -25,7 +25,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" import os -import os.path import string import sys import TestSCons diff --git a/test/CXX/SHCXXCOM.py b/test/CXX/SHCXXCOM.py index 628bc001..1a8750fe 100644 --- a/test/CXX/SHCXXCOM.py +++ b/test/CXX/SHCXXCOM.py @@ -28,8 +28,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" Test the ability to configure the $SHCXXCOM construction variable. """ -import os -import string import sys import TestSCons diff --git a/test/CXX/SHCXXCOMSTR.py b/test/CXX/SHCXXCOMSTR.py index dd925415..829c9e4a 100644 --- a/test/CXX/SHCXXCOMSTR.py +++ b/test/CXX/SHCXXCOMSTR.py @@ -29,8 +29,6 @@ Test that the $SHCXXCOMSTR construction variable allows you to customize the shared object C++ compilation output. """ -import os -import string import sys import TestSCons diff --git a/test/CacheDir/debug.py b/test/CacheDir/debug.py index ebf67f71..93012411 100644 --- a/test/CacheDir/debug.py +++ b/test/CacheDir/debug.py @@ -33,8 +33,6 @@ to build it because it doesn't exist in the CacheDir, and the time our build of the file completes and we push it out. """ -import os - import TestSCons test = TestSCons.TestSCons(match=TestSCons.match_re) diff --git a/test/CacheDir/symlink.py b/test/CacheDir/symlink.py index 6dd1f941..3bc8ec11 100644 --- a/test/CacheDir/symlink.py +++ b/test/CacheDir/symlink.py @@ -30,7 +30,6 @@ as an actualy symlink, not by copying the file contents. """ import os -import os.path import TestSCons diff --git a/test/CacheDir/up-to-date-q.py b/test/CacheDir/up-to-date-q.py index 0a491645..3830cd2e 100644 --- a/test/CacheDir/up-to-date-q.py +++ b/test/CacheDir/up-to-date-q.py @@ -59,7 +59,6 @@ int main(){ return 0; } """ sconstruct = """ -import os CacheDir(r'%s') Program('foo', 'foo.c') """ % test.workpath('cache') diff --git a/test/Chmod.py b/test/Chmod.py index 61d21eb2..b603f35d 100644 --- a/test/Chmod.py +++ b/test/Chmod.py @@ -29,7 +29,6 @@ Verify that the Chmod() Action works. """ import os -import os.path import stat import TestSCons diff --git a/test/Configure/ConfigureDryRunError.py b/test/Configure/ConfigureDryRunError.py index 65c64038..22436258 100644 --- a/test/Configure/ConfigureDryRunError.py +++ b/test/Configure/ConfigureDryRunError.py @@ -28,7 +28,7 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" Verify the ConfigureDryRunError. """ -import os.path +import os import TestSCons diff --git a/test/Configure/VariantDir.py b/test/Configure/VariantDir.py index 63fcb939..be2d77d5 100644 --- a/test/Configure/VariantDir.py +++ b/test/Configure/VariantDir.py @@ -28,7 +28,7 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" Verify that Configure contexts work with basic use of VariantDir. """ -import os.path +import os import TestSCons diff --git a/test/Configure/cache-not-ok.py b/test/Configure/cache-not-ok.py index 48524c2c..7dc8773b 100644 --- a/test/Configure/cache-not-ok.py +++ b/test/Configure/cache-not-ok.py @@ -28,8 +28,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" Verify that the cache mechanism works when checks are not ok. """ -import os.path - import TestSCons _exe = TestSCons._exe diff --git a/test/Configure/clean.py b/test/Configure/clean.py index 3fcfcbde..a48029db 100644 --- a/test/Configure/clean.py +++ b/test/Configure/clean.py @@ -29,8 +29,6 @@ Verify that we don't perform Configure context actions when the -c or --clean options have been specified. """ -import string - import TestSCons test = TestSCons.TestSCons(match = TestSCons.match_re_dotall) diff --git a/test/Configure/help.py b/test/Configure/help.py index 9f585139..9abdc619 100644 --- a/test/Configure/help.py +++ b/test/Configure/help.py @@ -29,8 +29,6 @@ Verify that we don't perform Configure context actions when the -H, -h or --help options have been specified. """ -import string - import TestSCons test = TestSCons.TestSCons(match = TestSCons.match_re_dotall) diff --git a/test/Copy-Action.py b/test/Copy-Action.py index 768d102c..252c458c 100644 --- a/test/Copy-Action.py +++ b/test/Copy-Action.py @@ -30,9 +30,8 @@ times and modes. """ import os -import os.path -import sys import stat +import sys import TestSCons diff --git a/test/D/DMD.py b/test/D/DMD.py index 8b443f89..47f7c3b4 100644 --- a/test/D/DMD.py +++ b/test/D/DMD.py @@ -25,8 +25,7 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" import os -import string -import sys + import TestSCons _exe = TestSCons._exe diff --git a/test/DSUFFIXES.py b/test/DSUFFIXES.py index a344112e..93e34f94 100644 --- a/test/DSUFFIXES.py +++ b/test/DSUFFIXES.py @@ -35,7 +35,6 @@ _python_ = TestSCons._python_ test = TestSCons.TestSCons() test.write('mydc.py', r""" -import string import sys def do_file(outf, inf): for line in open(inf, 'rb').readlines(): diff --git a/test/Deprecated/BuildDir.py b/test/Deprecated/BuildDir.py index 709ea8b4..a99d14f9 100644 --- a/test/Deprecated/BuildDir.py +++ b/test/Deprecated/BuildDir.py @@ -32,10 +32,8 @@ under the covers). Note that using BuildDir() does not yet print a deprecation warning. """ -import os.path import string -import sys -import time + import TestSCons _exe = TestSCons._exe diff --git a/test/Deprecated/Options/ListOption.py b/test/Deprecated/Options/ListOption.py index 62792b6c..369a8e12 100644 --- a/test/Deprecated/Options/ListOption.py +++ b/test/Deprecated/Options/ListOption.py @@ -29,7 +29,6 @@ Test the ListOption canned Option type. """ import os -import os.path import string import TestSCons diff --git a/test/Deprecated/Options/chdir.py b/test/Deprecated/Options/chdir.py index dd4eb70b..5d6d3ffb 100644 --- a/test/Deprecated/Options/chdir.py +++ b/test/Deprecated/Options/chdir.py @@ -51,7 +51,6 @@ print "VARIABLE =", repr(env['VARIABLE']) test.write(['bin', 'opts.cfg'], """\ import os -import os.path os.chdir(os.path.split(__name__)[0]) execfile('opts2.cfg') """) diff --git a/test/Deprecated/Options/help.py b/test/Deprecated/Options/help.py index 2ad52539..3905c777 100644 --- a/test/Deprecated/Options/help.py +++ b/test/Deprecated/Options/help.py @@ -30,7 +30,6 @@ Test the Options help messages. import os.path import re -import string try: True, False diff --git a/test/Deprecated/Options/import.py b/test/Deprecated/Options/import.py index 93849867..5a1627ba 100644 --- a/test/Deprecated/Options/import.py +++ b/test/Deprecated/Options/import.py @@ -52,7 +52,6 @@ print "VARIABLE =", env.get('VARIABLE') """ test.write(['bin', 'opts.cfg'], """\ -import sys from local_options import VARIABLE """ % locals()) diff --git a/test/Deprecated/SourceSignatures/basic.py b/test/Deprecated/SourceSignatures/basic.py index 50122963..2bfdd659 100644 --- a/test/Deprecated/SourceSignatures/basic.py +++ b/test/Deprecated/SourceSignatures/basic.py @@ -25,7 +25,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" import os -import os.path import re import TestSCons diff --git a/test/Deprecated/SourceSignatures/env.py b/test/Deprecated/SourceSignatures/env.py index ec6d3d27..12a596fb 100644 --- a/test/Deprecated/SourceSignatures/env.py +++ b/test/Deprecated/SourceSignatures/env.py @@ -30,7 +30,6 @@ default behavior. """ import os -import os.path import re import TestSCons diff --git a/test/Deprecated/SourceSignatures/no-csigs.py b/test/Deprecated/SourceSignatures/no-csigs.py index 01d05dae..be9cb092 100644 --- a/test/Deprecated/SourceSignatures/no-csigs.py +++ b/test/Deprecated/SourceSignatures/no-csigs.py @@ -26,7 +26,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" import os -import os.path import TestSCons import TestSConsign diff --git a/test/Deprecated/debug-dtree.py b/test/Deprecated/debug-dtree.py index 8918052c..3a772d7d 100644 --- a/test/Deprecated/debug-dtree.py +++ b/test/Deprecated/debug-dtree.py @@ -30,9 +30,6 @@ dependencies (sources or Depends()) of a target. """ import TestSCons -import sys -import re -import time test = TestSCons.TestSCons(match = TestSCons.match_re_dotall) diff --git a/test/Deprecated/debug-stree.py b/test/Deprecated/debug-stree.py index 9b6e067a..714b5b3a 100644 --- a/test/Deprecated/debug-stree.py +++ b/test/Deprecated/debug-stree.py @@ -29,11 +29,9 @@ Test that the --debug=stree option prints a dependency tree with output that indicates the state of various Node status flags. """ -import TestSCons -import sys import string -import re -import time + +import TestSCons test = TestSCons.TestSCons(match = TestSCons.match_re_dotall) diff --git a/test/Deprecated/debug-tree.py b/test/Deprecated/debug-tree.py index 73b8ec01..833abd5b 100644 --- a/test/Deprecated/debug-tree.py +++ b/test/Deprecated/debug-tree.py @@ -30,9 +30,6 @@ complete dependencies of a target. """ import TestSCons -import sys -import re -import time test = TestSCons.TestSCons(match = TestSCons.match_re_dotall) diff --git a/test/Dir/source.py b/test/Dir/source.py index 68165f30..c797246a 100644 --- a/test/Dir/source.py +++ b/test/Dir/source.py @@ -31,7 +31,6 @@ In other words, if a build has a directory as a source file, any change in any file under that directory should trigger a rebuild. """ -import sys import TestSCons diff --git a/test/Fortran/F77PATH.py b/test/Fortran/F77PATH.py index e1973da6..cc627197 100644 --- a/test/Fortran/F77PATH.py +++ b/test/Fortran/F77PATH.py @@ -25,7 +25,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" import os -import string import TestSCons diff --git a/test/Fortran/F90PATH.py b/test/Fortran/F90PATH.py index c069f64a..d8f73f42 100644 --- a/test/Fortran/F90PATH.py +++ b/test/Fortran/F90PATH.py @@ -25,7 +25,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" import os -import string import TestSCons diff --git a/test/Fortran/FORTRANPATH.py b/test/Fortran/FORTRANPATH.py index 465b5c76..bf99b5b9 100644 --- a/test/Fortran/FORTRANPATH.py +++ b/test/Fortran/FORTRANPATH.py @@ -25,7 +25,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" import os -import string import TestSCons diff --git a/test/Fortran/FORTRANSUFFIXES.py b/test/Fortran/FORTRANSUFFIXES.py index 3011fac7..353405b9 100644 --- a/test/Fortran/FORTRANSUFFIXES.py +++ b/test/Fortran/FORTRANSUFFIXES.py @@ -35,7 +35,6 @@ _python_ = TestSCons._python_ test = TestSCons.TestSCons() test.write('myfc.py', r""" -import string import sys def do_file(outf, inf): for line in open(inf, 'rb').readlines(): diff --git a/test/Ghostscript/GS.py b/test/Ghostscript/GS.py index 6089d60a..ab253696 100644 --- a/test/Ghostscript/GS.py +++ b/test/Ghostscript/GS.py @@ -25,9 +25,9 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" import os -import os.path import string import sys + import TestSCons _python_ = TestSCons._python_ diff --git a/test/Ghostscript/GSFLAGS.py b/test/Ghostscript/GSFLAGS.py index 7acb89ec..eab925d8 100644 --- a/test/Ghostscript/GSFLAGS.py +++ b/test/Ghostscript/GSFLAGS.py @@ -25,9 +25,9 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" import os -import os.path import string import sys + import TestSCons _python_ = TestSCons._python_ diff --git a/test/Glob/glob-libpath.py b/test/Glob/glob-libpath.py index fb16fca0..1effcc19 100644 --- a/test/Glob/glob-libpath.py +++ b/test/Glob/glob-libpath.py @@ -30,7 +30,6 @@ See bug #2184, "Glob pollutes LIBPATH" from Ian P. Cardenas. Test output should not contain -Lsrc/util. """ -import TestCmd import TestSCons test = TestSCons.TestSCons() diff --git a/test/IDL/midl.py b/test/IDL/midl.py index 88e0517a..ac9597cd 100644 --- a/test/IDL/midl.py +++ b/test/IDL/midl.py @@ -26,10 +26,8 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" import TestSCons import sys -import os.path import os import TestCmd -import time test = TestSCons.TestSCons(match = TestCmd.match_re) diff --git a/test/Install/Install.py b/test/Install/Install.py index c38edaa1..8c520157 100644 --- a/test/Install/Install.py +++ b/test/Install/Install.py @@ -30,8 +30,8 @@ Verify that the Install() Builder works import os.path import string -import sys import time + import TestSCons test = TestSCons.TestSCons() diff --git a/test/Install/InstallAs.py b/test/Install/InstallAs.py index 8b279f10..ba832597 100644 --- a/test/Install/InstallAs.py +++ b/test/Install/InstallAs.py @@ -29,7 +29,7 @@ Test the InstallAs() Environment method. """ import os.path -import sys + import TestSCons test = TestSCons.TestSCons() diff --git a/test/Install/directories.py b/test/Install/directories.py index 3005859a..5a795afc 100644 --- a/test/Install/directories.py +++ b/test/Install/directories.py @@ -29,9 +29,7 @@ Test using Install() on directories. """ import os.path -import string -import sys -import time + import TestSCons test = TestSCons.TestSCons() diff --git a/test/Install/option--install-sandbox.py b/test/Install/option--install-sandbox.py index 3ec5b3bf..32e61a18 100644 --- a/test/Install/option--install-sandbox.py +++ b/test/Install/option--install-sandbox.py @@ -29,7 +29,7 @@ Test the --install-sandbox commandline option for Install() and InstallAs(). """ import os.path -import sys + import TestSCons test = TestSCons.TestSCons() diff --git a/test/Interactive/added-include.py b/test/Interactive/added-include.py index 73f80965..ca7c92f5 100644 --- a/test/Interactive/added-include.py +++ b/test/Interactive/added-include.py @@ -30,8 +30,6 @@ rebuild a target when an implicit dependency (include line) is added to the source file. """ -import string - import TestSCons test = TestSCons.TestSCons() diff --git a/test/Java/JAR.py b/test/Java/JAR.py index ee552f45..34657ff7 100644 --- a/test/Java/JAR.py +++ b/test/Java/JAR.py @@ -25,7 +25,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" import os -import os.path import string import sys import TestSCons diff --git a/test/Java/JAVAC.py b/test/Java/JAVAC.py index 09639ea6..baedac0f 100644 --- a/test/Java/JAVAC.py +++ b/test/Java/JAVAC.py @@ -29,9 +29,8 @@ Test setting the JAVAC variable. """ import os -import os.path -import string import sys + import TestSCons _python_ = TestSCons._python_ diff --git a/test/Java/JAVAH.py b/test/Java/JAVAH.py index 95abd33f..32ad1195 100644 --- a/test/Java/JAVAH.py +++ b/test/Java/JAVAH.py @@ -24,7 +24,7 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" -import os.path +import os import string import TestSCons diff --git a/test/Java/Java-1.4.py b/test/Java/Java-1.4.py index 3c0e1ed8..0906513d 100644 --- a/test/Java/Java-1.4.py +++ b/test/Java/Java-1.4.py @@ -29,9 +29,8 @@ Test Java compilation with a live Java 1.4 "javac" compiler. """ import os -import os.path -import string import sys + import TestSCons _python_ = TestSCons._python_ diff --git a/test/Java/Java-1.5.py b/test/Java/Java-1.5.py index f6d93c7a..20ebc250 100644 --- a/test/Java/Java-1.5.py +++ b/test/Java/Java-1.5.py @@ -29,9 +29,8 @@ Test Java compilation with a live Java 1.5 "javac" compiler. """ import os -import os.path -import string import sys + import TestSCons _python_ = TestSCons._python_ diff --git a/test/Java/Java-1.6.py b/test/Java/Java-1.6.py index 5bd8e2f5..649cf010 100644 --- a/test/Java/Java-1.6.py +++ b/test/Java/Java-1.6.py @@ -29,9 +29,8 @@ Test Java compilation with a live Java 1.6 "javac" compiler. """ import os -import os.path -import string import sys + import TestSCons _python_ = TestSCons._python_ diff --git a/test/Java/RMIC.py b/test/Java/RMIC.py index f9721c2f..3340707a 100644 --- a/test/Java/RMIC.py +++ b/test/Java/RMIC.py @@ -27,6 +27,7 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" import os import string import sys + import TestSCons _python_ = TestSCons._python_ @@ -34,7 +35,7 @@ _python_ = TestSCons._python_ test = TestSCons.TestSCons() test.write('myrmic.py', r""" -import os.path +import os import sys args = sys.argv[1:] while args: diff --git a/test/Java/multi-step.py b/test/Java/multi-step.py index b5f24f94..34e814b3 100644 --- a/test/Java/multi-step.py +++ b/test/Java/multi-step.py @@ -29,6 +29,8 @@ Real-world test (courtesy Leanid Nazdrynau) of the multi-step capabilities of the various Java Builders. """ +import os + import TestSCons test = TestSCons.TestSCons() @@ -562,7 +564,6 @@ test.must_exist(['buildout', 'jni', 'SampleTest.java']) # a SampleTest.class file, while others do. Only issue a warning if # it doesn't exist. p = test.workpath('buildout', 'jni', 'SampleTest.class') -import os.path if not os.path.exists(p): print 'Warning: %s does not exist' % p diff --git a/test/Java/nested-classes.py b/test/Java/nested-classes.py index 3d3e9904..3550e768 100644 --- a/test/Java/nested-classes.py +++ b/test/Java/nested-classes.py @@ -29,9 +29,7 @@ Test Java compilation with inner and anonymous classes (Issue 2087). """ import os -import os.path -import string -import sys + import TestSCons _python_ = TestSCons._python_ diff --git a/test/LEX/LEX.py b/test/LEX/LEX.py index 91b4614d..94692dbb 100644 --- a/test/LEX/LEX.py +++ b/test/LEX/LEX.py @@ -25,7 +25,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" import os -import os.path import string import sys import TestSCons diff --git a/test/LEX/LEXFLAGS.py b/test/LEX/LEXFLAGS.py index e72fa9e8..1555142c 100644 --- a/test/LEX/LEXFLAGS.py +++ b/test/LEX/LEXFLAGS.py @@ -25,7 +25,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" import os -import os.path import string import sys import TestSCons diff --git a/test/LINK/LINKCOM.py b/test/LINK/LINKCOM.py index d9140490..db8a2215 100644 --- a/test/LINK/LINKCOM.py +++ b/test/LINK/LINKCOM.py @@ -28,9 +28,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" Test the ability to configure the $LINKCOM construction variable. """ -import os -import string -import sys import TestSCons _python_ = TestSCons._python_ diff --git a/test/LINK/LINKCOMSTR.py b/test/LINK/LINKCOMSTR.py index 1a7efbe1..9eb40271 100644 --- a/test/LINK/LINKCOMSTR.py +++ b/test/LINK/LINKCOMSTR.py @@ -29,7 +29,6 @@ Test that the $LINKCOMSTR construction variable allows you to customize the displayed linker string. """ -import os import string import sys import TestSCons diff --git a/test/LINK/SHLINKCOM.py b/test/LINK/SHLINKCOM.py index 2d2f7184..667564e4 100644 --- a/test/LINK/SHLINKCOM.py +++ b/test/LINK/SHLINKCOM.py @@ -28,8 +28,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" Test the ability to configure the $SHLINKCOM construction variable. """ -import os -import string import sys import TestSCons diff --git a/test/LINK/SHLINKCOMSTR.py b/test/LINK/SHLINKCOMSTR.py index 94740b89..a3dc2cf3 100644 --- a/test/LINK/SHLINKCOMSTR.py +++ b/test/LINK/SHLINKCOMSTR.py @@ -29,9 +29,6 @@ Test that the $SHLINKCOMSTR construction variable allows you to customize the displayed linker string for programs using shared libraries. """ -import os -import string -import sys import TestSCons _python_ = TestSCons._python_ diff --git a/test/Libs/LIBPATH.py b/test/Libs/LIBPATH.py index 7fd4f9bd..e52cb9fa 100644 --- a/test/Libs/LIBPATH.py +++ b/test/Libs/LIBPATH.py @@ -24,11 +24,11 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" -import TestSCons -import sys import os.path import time +import TestSCons + _exe = TestSCons._exe _dll = TestSCons._dll dll_ = TestSCons.dll_ diff --git a/test/Libs/SHLIBPREFIX.py b/test/Libs/SHLIBPREFIX.py index 87b92fae..2af6a96c 100644 --- a/test/Libs/SHLIBPREFIX.py +++ b/test/Libs/SHLIBPREFIX.py @@ -25,7 +25,7 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" import os -import sys + import TestSCons _lib = TestSCons._dll diff --git a/test/Libs/SHLIBSUFFIX.py b/test/Libs/SHLIBSUFFIX.py index dc88e3b1..e2509fab 100644 --- a/test/Libs/SHLIBSUFFIX.py +++ b/test/Libs/SHLIBSUFFIX.py @@ -25,7 +25,7 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" import os -import sys + import TestSCons dll_ = TestSCons.dll_ diff --git a/test/Libs/SharedLibrary.py b/test/Libs/SharedLibrary.py index 554f8dfa..b688a0bd 100644 --- a/test/Libs/SharedLibrary.py +++ b/test/Libs/SharedLibrary.py @@ -28,7 +28,6 @@ import os import string import sys -import TestCmd import TestSCons test = TestSCons.TestSCons() diff --git a/test/M4/M4.py b/test/M4/M4.py index 859c57ba..d7d87bd5 100644 --- a/test/M4/M4.py +++ b/test/M4/M4.py @@ -29,7 +29,6 @@ Test that $M4 and $M4FLAGS work as expected. """ import os -import os.path import string import sys import TestSCons diff --git a/test/MSVC/PCHSTOP-errors.py b/test/MSVC/PCHSTOP-errors.py index c0bc693d..8c5bb140 100644 --- a/test/MSVC/PCHSTOP-errors.py +++ b/test/MSVC/PCHSTOP-errors.py @@ -1,75 +1,75 @@ -#!/usr/bin/env python -# -# __COPYRIGHT__ -# -# Permission is hereby granted, free of charge, to any person obtaining -# a copy of this software and associated documentation files (the -# "Software"), to deal in the Software without restriction, including -# without limitation the rights to use, copy, modify, merge, publish, -# distribute, sublicense, and/or sell copies of the Software, and to -# permit persons to whom the Software is furnished to do so, subject to -# the following conditions: -# -# The above copyright notice and this permission notice shall be included -# in all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY -# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE -# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -# - -__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" - -""" -# Test error reporting -""" - -import re -import sys - -import TestSCons - -test = TestSCons.TestSCons(match = TestSCons.match_re) - -if sys.platform != 'win32': - msg = "Skipping Visual C/C++ test on non-Windows platform '%s'\n" % sys.platform - test.skip_test(msg) - - - -SConstruct_path = test.workpath('SConstruct') - -test.write(SConstruct_path, """\ -env = Environment() -env['PDB'] = File('test.pdb') -env['PCH'] = env.PCH('StdAfx.cpp')[0] -if int(ARGUMENTS.get('SET_PCHSTOP')): - env['PCHSTOP'] = File('StdAfx.h') -env.Program('test', 'test.cpp') -""") - - - -expect_stderr = r''' -scons: \*\*\* The PCHSTOP construction must be defined if PCH is defined. -File "%s", line \d+, in \? -''' % re.escape(SConstruct_path) - -test.run(arguments='SET_PCHSTOP=0', status=2, stderr=expect_stderr) - - - -expect_stderr = r''' -scons: \*\*\* The PCHSTOP construction variable must be a string: .+ -File "%s", line \d+, in \? -''' % re.escape(SConstruct_path) - -test.run(arguments='SET_PCHSTOP=1', status=2, stderr=expect_stderr) - - - -test.pass_test() +#!/usr/bin/env python +# +# __COPYRIGHT__ +# +# Permission is hereby granted, free of charge, to any person obtaining +# a copy of this software and associated documentation files (the +# "Software"), to deal in the Software without restriction, including +# without limitation the rights to use, copy, modify, merge, publish, +# distribute, sublicense, and/or sell copies of the Software, and to +# permit persons to whom the Software is furnished to do so, subject to +# the following conditions: +# +# The above copyright notice and this permission notice shall be included +# in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY +# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE +# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +# + +__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" + +""" +# Test error reporting +""" + +import re +import sys + +import TestSCons + +test = TestSCons.TestSCons(match = TestSCons.match_re) + +if sys.platform != 'win32': + msg = "Skipping Visual C/C++ test on non-Windows platform '%s'\n" % sys.platform + test.skip_test(msg) + + + +SConstruct_path = test.workpath('SConstruct') + +test.write(SConstruct_path, """\ +env = Environment() +env['PDB'] = File('test.pdb') +env['PCH'] = env.PCH('StdAfx.cpp')[0] +if int(ARGUMENTS.get('SET_PCHSTOP')): + env['PCHSTOP'] = File('StdAfx.h') +env.Program('test', 'test.cpp') +""") + + + +expect_stderr = r''' +scons: \*\*\* The PCHSTOP construction must be defined if PCH is defined. +File "%s", line \d+, in \? +''' % re.escape(SConstruct_path) + +test.run(arguments='SET_PCHSTOP=0', status=2, stderr=expect_stderr) + + + +expect_stderr = r''' +scons: \*\*\* The PCHSTOP construction variable must be a string: .+ +File "%s", line \d+, in \? +''' % re.escape(SConstruct_path) + +test.run(arguments='SET_PCHSTOP=1', status=2, stderr=expect_stderr) + + + +test.pass_test() diff --git a/test/MSVC/msvc.py b/test/MSVC/msvc.py index c2a2d0e3..fe464c4c 100644 --- a/test/MSVC/msvc.py +++ b/test/MSVC/msvc.py @@ -25,7 +25,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" import os -import re import sys import time diff --git a/test/MSVS/common-prefix.py b/test/MSVS/common-prefix.py index 5a49a8c2..66a8a8b8 100644 --- a/test/MSVS/common-prefix.py +++ b/test/MSVS/common-prefix.py @@ -31,10 +31,8 @@ solution (.sln) files that look correct. """ import os -import os.path import sys -import TestCmd import TestSConsMSVS test = TestSConsMSVS.TestSConsMSVS() diff --git a/test/MSVS/runfile.py b/test/MSVS/runfile.py index c775bdc7..3edd711e 100644 --- a/test/MSVS/runfile.py +++ b/test/MSVS/runfile.py @@ -31,10 +31,8 @@ solution (.sln) files that look correct. """ import os -import os.path import sys -import TestCmd import TestSConsMSVS test = TestSConsMSVS.TestSConsMSVS() diff --git a/test/Parallel/failed-build.py b/test/Parallel/failed-build.py index 64e90c94..7056db19 100644 --- a/test/Parallel/failed-build.py +++ b/test/Parallel/failed-build.py @@ -62,7 +62,7 @@ test = TestSCons.TestSCons() # it sees the failure from the first script. test.write('myfail.py', r"""\ -import os.path +import os import sys import time while not os.path.exists('mycopy.started'): diff --git a/test/ParseConfig.py b/test/ParseConfig.py index ed222764..8ba166f5 100644 --- a/test/ParseConfig.py +++ b/test/ParseConfig.py @@ -24,10 +24,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" -import os -import sys - -import TestCmd import TestSCons _python_ = TestSCons._python_ diff --git a/test/PharLap.py b/test/PharLap.py index c8353f43..991ac0b9 100644 --- a/test/PharLap.py +++ b/test/PharLap.py @@ -25,12 +25,11 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" import os -import os.path -import string import sys -import TestSCons import time +import TestSCons + test = TestSCons.TestSCons() if sys.platform != 'win32': diff --git a/test/Program-j.py b/test/Program-j.py index d8180bb6..62bbf3c5 100644 --- a/test/Program-j.py +++ b/test/Program-j.py @@ -24,7 +24,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" -import sys import TestSCons _exe = TestSCons._exe diff --git a/test/Program.py b/test/Program.py index cf981489..a54d7c16 100644 --- a/test/Program.py +++ b/test/Program.py @@ -25,8 +25,8 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" import os.path -import sys import time + import TestSCons _exe = TestSCons._exe diff --git a/test/QT/Tool.py b/test/QT/Tool.py index 6c4a2ebe..bb6b8513 100644 --- a/test/QT/Tool.py +++ b/test/QT/Tool.py @@ -46,7 +46,6 @@ if not os.environ.get('QTDIR', None): test.write('SConstruct', """ import os -import os.path def DoWithVariables(variables, prefix, what): saved_variables = { } diff --git a/test/QT/installed.py b/test/QT/installed.py index 25e8b916..dde81c70 100644 --- a/test/QT/installed.py +++ b/test/QT/installed.py @@ -29,7 +29,6 @@ Look if qt is installed, and try out all builders. """ import os -import re import string import sys diff --git a/test/QT/up-to-date.py b/test/QT/up-to-date.py index b6ebfdff..28ae16e6 100644 --- a/test/QT/up-to-date.py +++ b/test/QT/up-to-date.py @@ -52,7 +52,6 @@ test.subdir('layer', test.write('SConstruct', """\ import os -import sys aa=os.getcwd() env=Environment(tools=['default','expheaders','qt'],toolpath=[aa]) diff --git a/test/RANLIB/RANLIB.py b/test/RANLIB/RANLIB.py index 75e860ab..3cf9c054 100644 --- a/test/RANLIB/RANLIB.py +++ b/test/RANLIB/RANLIB.py @@ -25,7 +25,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" import os -import os.path import string import sys import TestSCons diff --git a/test/RCS/changed.py b/test/RCS/changed.py index 6aaeffb9..9a918db4 100644 --- a/test/RCS/changed.py +++ b/test/RCS/changed.py @@ -28,8 +28,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" Test explicit checkouts from local RCS files. """ -import os.path - import TestSCons test = TestSCons.TestSCons() diff --git a/test/RCS/diskcheck.py b/test/RCS/diskcheck.py index 99ba7edf..b6b10700 100644 --- a/test/RCS/diskcheck.py +++ b/test/RCS/diskcheck.py @@ -28,7 +28,7 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" Test transparent RCS checkouts from an RCS subdirectory. """ -import os.path +import os import TestSCons diff --git a/test/RCS/explicit.py b/test/RCS/explicit.py index d3d5d877..46ed8b64 100644 --- a/test/RCS/explicit.py +++ b/test/RCS/explicit.py @@ -28,7 +28,7 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" Test explicit checkouts from local RCS files. """ -import os.path +import os import TestSCons diff --git a/test/RCS/transparent.py b/test/RCS/transparent.py index 28dc558b..1aceb460 100644 --- a/test/RCS/transparent.py +++ b/test/RCS/transparent.py @@ -28,7 +28,7 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" Test transparent RCS checkouts from an RCS subdirectory. """ -import os.path +import os import TestSCons diff --git a/test/Repository/Default.py b/test/Repository/Default.py index ff5a5043..82751c34 100644 --- a/test/Repository/Default.py +++ b/test/Repository/Default.py @@ -25,7 +25,7 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" import os.path -import sys + import TestSCons test = TestSCons.TestSCons() diff --git a/test/Repository/Install.py b/test/Repository/Install.py index 4df9c243..d0038e39 100644 --- a/test/Repository/Install.py +++ b/test/Repository/Install.py @@ -25,7 +25,7 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" import os.path -import sys + import TestSCons test = TestSCons.TestSCons() diff --git a/test/Repository/InstallAs.py b/test/Repository/InstallAs.py index 749c745e..28b94216 100644 --- a/test/Repository/InstallAs.py +++ b/test/Repository/InstallAs.py @@ -25,7 +25,7 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" import os.path -import sys + import TestSCons test = TestSCons.TestSCons() diff --git a/test/Repository/Java.py b/test/Repository/Java.py index e9644563..2c5e30d1 100644 --- a/test/Repository/Java.py +++ b/test/Repository/Java.py @@ -29,8 +29,7 @@ Test building Java applications when using Repositories. """ import os -import string -import sys + import TestSCons python = TestSCons.python diff --git a/test/Repository/JavaH.py b/test/Repository/JavaH.py index 258d9bd1..9128b6d2 100644 --- a/test/Repository/JavaH.py +++ b/test/Repository/JavaH.py @@ -29,8 +29,7 @@ Test building Java applications when using Repositories. """ import os -import string -import sys + import TestSCons python = TestSCons.python diff --git a/test/Repository/Local.py b/test/Repository/Local.py index b7f4e337..a099e40c 100644 --- a/test/Repository/Local.py +++ b/test/Repository/Local.py @@ -25,7 +25,7 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" import os.path -import sys + import TestSCons test = TestSCons.TestSCons() diff --git a/test/Repository/M4.py b/test/Repository/M4.py index 3178fbbf..09c38618 100644 --- a/test/Repository/M4.py +++ b/test/Repository/M4.py @@ -29,7 +29,6 @@ Test that $M4 and $M4FLAGS work with repositories. """ import os -import os.path import string import sys import TestSCons diff --git a/test/Repository/SharedLibrary.py b/test/Repository/SharedLibrary.py index 697e6ae0..6b65def6 100644 --- a/test/Repository/SharedLibrary.py +++ b/test/Repository/SharedLibrary.py @@ -33,7 +33,6 @@ import os import string import sys -import TestCmd import TestSCons test = TestSCons.TestSCons() diff --git a/test/Repository/VariantDir.py b/test/Repository/VariantDir.py index 2766c80a..ea11404f 100644 --- a/test/Repository/VariantDir.py +++ b/test/Repository/VariantDir.py @@ -25,7 +25,7 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" import os.path -import sys + import TestSCons test = TestSCons.TestSCons() diff --git a/test/Repository/no-repository.py b/test/Repository/no-repository.py index f9b245e9..a8ec7cab 100644 --- a/test/Repository/no-repository.py +++ b/test/Repository/no-repository.py @@ -24,9 +24,8 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" -import os -import string import sys + import TestSCons python = TestSCons.python diff --git a/test/Repository/option-c.py b/test/Repository/option-c.py index 7013cab1..1d440eb0 100644 --- a/test/Repository/option-c.py +++ b/test/Repository/option-c.py @@ -25,7 +25,7 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" import os.path -import sys + import TestSCons test = TestSCons.TestSCons() diff --git a/test/Repository/option-n.py b/test/Repository/option-n.py index 10016a01..c6793fcb 100644 --- a/test/Repository/option-n.py +++ b/test/Repository/option-n.py @@ -30,7 +30,7 @@ local copy of a file specified as Local() in the SConstruct. __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" import os.path -import sys + import TestSCons test = TestSCons.TestSCons() diff --git a/test/Repository/signature-order.py b/test/Repository/signature-order.py index 99bc56a7..fd361828 100644 --- a/test/Repository/signature-order.py +++ b/test/Repository/signature-order.py @@ -30,7 +30,6 @@ signatures changes because an included file shifts from the local sandbox to a Repository and vice versa. """ -import sys import TestSCons _exe = TestSCons._exe diff --git a/test/Rpcgen/RPCGENCLIENTFLAGS.py b/test/Rpcgen/RPCGENCLIENTFLAGS.py index 66ea6dfe..5bf14cee 100644 --- a/test/Rpcgen/RPCGENCLIENTFLAGS.py +++ b/test/Rpcgen/RPCGENCLIENTFLAGS.py @@ -24,9 +24,9 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" -import os import string import sys + import TestSCons _python_ = TestSCons._python_ diff --git a/test/Rpcgen/RPCGENFLAGS.py b/test/Rpcgen/RPCGENFLAGS.py index 8f6cfffc..f18dba27 100644 --- a/test/Rpcgen/RPCGENFLAGS.py +++ b/test/Rpcgen/RPCGENFLAGS.py @@ -24,9 +24,9 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" -import os import string import sys + import TestSCons _python_ = TestSCons._python_ diff --git a/test/Rpcgen/RPCGENHEADERFLAGS.py b/test/Rpcgen/RPCGENHEADERFLAGS.py index 411838d5..c1eac5a4 100644 --- a/test/Rpcgen/RPCGENHEADERFLAGS.py +++ b/test/Rpcgen/RPCGENHEADERFLAGS.py @@ -24,9 +24,9 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" -import os import string import sys + import TestSCons _python_ = TestSCons._python_ diff --git a/test/Rpcgen/RPCGENSERVICEFLAGS.py b/test/Rpcgen/RPCGENSERVICEFLAGS.py index af638ced..bf88a246 100644 --- a/test/Rpcgen/RPCGENSERVICEFLAGS.py +++ b/test/Rpcgen/RPCGENSERVICEFLAGS.py @@ -24,9 +24,9 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" -import os import string import sys + import TestSCons _python_ = TestSCons._python_ diff --git a/test/Rpcgen/RPCGENXDRFLAGS.py b/test/Rpcgen/RPCGENXDRFLAGS.py index 6ce06091..85ec6dc6 100644 --- a/test/Rpcgen/RPCGENXDRFLAGS.py +++ b/test/Rpcgen/RPCGENXDRFLAGS.py @@ -24,9 +24,9 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" -import os import string import sys + import TestSCons _python_ = TestSCons._python_ diff --git a/test/SCONS_LIB_DIR.py b/test/SCONS_LIB_DIR.py index 553da1dc..e784e2b6 100644 --- a/test/SCONS_LIB_DIR.py +++ b/test/SCONS_LIB_DIR.py @@ -26,7 +26,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" import TestSCons import os -import string test = TestSCons.TestSCons() diff --git a/test/SConscript/SConscriptChdir.py b/test/SConscript/SConscriptChdir.py index 3763378a..348f87e7 100644 --- a/test/SConscript/SConscriptChdir.py +++ b/test/SConscript/SConscriptChdir.py @@ -24,7 +24,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" -import sys import TestSCons test = TestSCons.TestSCons() diff --git a/test/SConscriptChdir.py b/test/SConscriptChdir.py index 3763378a..348f87e7 100644 --- a/test/SConscriptChdir.py +++ b/test/SConscriptChdir.py @@ -24,7 +24,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" -import sys import TestSCons test = TestSCons.TestSCons() diff --git a/test/SWIG/SWIGFLAGS.py b/test/SWIG/SWIGFLAGS.py index 22c311b0..27fa5e3c 100644 --- a/test/SWIG/SWIGFLAGS.py +++ b/test/SWIG/SWIGFLAGS.py @@ -28,8 +28,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" Verify that we can use ${SOURCE} expansions in $SWIGFLAGS. """ -import sys - import TestSCons test = TestSCons.TestSCons() diff --git a/test/SWIG/SWIGOUTDIR.py b/test/SWIG/SWIGOUTDIR.py index a875e801..dedc03ce 100644 --- a/test/SWIG/SWIGOUTDIR.py +++ b/test/SWIG/SWIGOUTDIR.py @@ -29,8 +29,6 @@ Verify that use of the $SWIGOUTDIR variable causes SCons to recognize that Java files are created in the specified output directory. """ -import sys - import TestSCons test = TestSCons.TestSCons() diff --git a/test/SWIG/implicit-dependencies.py b/test/SWIG/implicit-dependencies.py index 9b3eb8e3..99aa59c7 100644 --- a/test/SWIG/implicit-dependencies.py +++ b/test/SWIG/implicit-dependencies.py @@ -28,8 +28,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" Verify that SWIG implicit dependencies are caught. """ -import sys - import TestSCons test = TestSCons.TestSCons() diff --git a/test/Scanner/exception.py b/test/Scanner/exception.py index 31e571d6..ceaca14f 100644 --- a/test/Scanner/exception.py +++ b/test/Scanner/exception.py @@ -24,8 +24,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" -import string -import sys import TestSCons python = TestSCons.python diff --git a/test/Scanner/generated.py b/test/Scanner/generated.py index 507a3d3a..df7f20a4 100644 --- a/test/Scanner/generated.py +++ b/test/Scanner/generated.py @@ -34,10 +34,8 @@ factors triggered the bug Scott saw, and partly because the real-world complexity is valuable in its own right. """ -import os.path import sys -import TestCmd import TestSCons test = TestSCons.TestSCons() diff --git a/test/SideEffect/basic.py b/test/SideEffect/basic.py index b01020bb..f0754309 100644 --- a/test/SideEffect/basic.py +++ b/test/SideEffect/basic.py @@ -30,7 +30,6 @@ file" as the side effect "target." """ import os.path -import string import TestSCons diff --git a/test/SideEffect/directory.py b/test/SideEffect/directory.py index 5ede8539..ec4f2615 100644 --- a/test/SideEffect/directory.py +++ b/test/SideEffect/directory.py @@ -28,9 +28,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" Verify that a directory (Dir()) works as a SideEffect() "target." """ -import os.path -import string - import TestSCons test = TestSCons.TestSCons() diff --git a/test/SourceCode.py b/test/SourceCode.py index b74f8b1d..2c01158e 100644 --- a/test/SourceCode.py +++ b/test/SourceCode.py @@ -29,7 +29,6 @@ Test fetching source files using the SourceCode() method. """ import os -import stat import TestSCons @@ -38,7 +37,7 @@ test = TestSCons.TestSCons() test.subdir('sub', 'sub2') test.write('SConstruct', """\ -import os.path +import os def cat(env, source, target): target = str(target[0]) diff --git a/test/TAR/TAR.py b/test/TAR/TAR.py index c82e227a..8a9a1977 100644 --- a/test/TAR/TAR.py +++ b/test/TAR/TAR.py @@ -25,7 +25,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" import os -import os.path import string import sys import TestSCons diff --git a/test/TAR/TARCOM.py b/test/TAR/TARCOM.py index a39dd22f..a7313b37 100644 --- a/test/TAR/TARCOM.py +++ b/test/TAR/TARCOM.py @@ -28,9 +28,8 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" Test the ability to configure the $TARCOM construction variable. """ -import os -import string import sys + import TestSCons _python_ = TestSCons._python_ diff --git a/test/TAR/TARFLAGS.py b/test/TAR/TARFLAGS.py index c592fe00..f2973b48 100644 --- a/test/TAR/TARFLAGS.py +++ b/test/TAR/TARFLAGS.py @@ -25,7 +25,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" import os -import os.path import string import sys import TestSCons diff --git a/test/TEX/LATEX.py b/test/TEX/LATEX.py index d80636f4..704443a5 100644 --- a/test/TEX/LATEX.py +++ b/test/TEX/LATEX.py @@ -31,7 +31,6 @@ and that we can use this to wrap calls to the real latex utility. """ import os -import os.path import string import sys import TestSCons diff --git a/test/TEX/LATEX2.py b/test/TEX/LATEX2.py index 8ef73213..b67c2b1a 100644 --- a/test/TEX/LATEX2.py +++ b/test/TEX/LATEX2.py @@ -29,9 +29,7 @@ Validate that we can produce several .pdf at once from several sources. """ import os -import os.path -import string -import sys + import TestSCons _python_ = TestSCons._python_ diff --git a/test/TEX/LATEXCOM.py b/test/TEX/LATEXCOM.py index a5044ae9..dee78e92 100644 --- a/test/TEX/LATEXCOM.py +++ b/test/TEX/LATEXCOM.py @@ -28,9 +28,8 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" Test the ability to configure the $LATEXCOM construction variable. """ -import os -import string import sys + import TestSCons _python_ = TestSCons._python_ diff --git a/test/TEX/LATEXCOMSTR.py b/test/TEX/LATEXCOMSTR.py index 08fcccb9..043bab56 100644 --- a/test/TEX/LATEXCOMSTR.py +++ b/test/TEX/LATEXCOMSTR.py @@ -29,9 +29,8 @@ Test that the $LATEXCOMSTR construction variable allows you to configure the C compilation output. """ -import os -import string import sys + import TestSCons _python_ = TestSCons._python_ diff --git a/test/TEX/LATEXFLAGS.py b/test/TEX/LATEXFLAGS.py index 6df1daf4..568d2a8d 100644 --- a/test/TEX/LATEXFLAGS.py +++ b/test/TEX/LATEXFLAGS.py @@ -25,7 +25,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" import os -import os.path import string import sys import TestSCons diff --git a/test/TEX/PDFLATEX.py b/test/TEX/PDFLATEX.py index 11ada7b5..af8031a6 100644 --- a/test/TEX/PDFLATEX.py +++ b/test/TEX/PDFLATEX.py @@ -31,7 +31,6 @@ and that we can use this to wrap calls to the real latex utility. """ import os -import os.path import string import sys import TestSCons diff --git a/test/TEX/PDFLATEXCOM.py b/test/TEX/PDFLATEXCOM.py index 1ce2642d..1887fb05 100644 --- a/test/TEX/PDFLATEXCOM.py +++ b/test/TEX/PDFLATEXCOM.py @@ -28,9 +28,8 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" Test the ability to configure the $PDFLATEXCOM construction variable. """ -import os -import string import sys + import TestSCons _python_ = TestSCons._python_ diff --git a/test/TEX/PDFLATEXCOMSTR.py b/test/TEX/PDFLATEXCOMSTR.py index 284a52ad..6b08d081 100644 --- a/test/TEX/PDFLATEXCOMSTR.py +++ b/test/TEX/PDFLATEXCOMSTR.py @@ -30,9 +30,8 @@ Test that the $PDFLATEXCOMSTR construction variable allows you to configure the C compilation output. """ -import os -import string import sys + import TestSCons _python_ = TestSCons._python_ diff --git a/test/TEX/PDFLATEXFLAGS.py b/test/TEX/PDFLATEXFLAGS.py index 0ab76a1e..07a1d541 100644 --- a/test/TEX/PDFLATEXFLAGS.py +++ b/test/TEX/PDFLATEXFLAGS.py @@ -25,7 +25,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" import os -import os.path import string import sys import TestSCons diff --git a/test/TEX/PDFTEX.py b/test/TEX/PDFTEX.py index cde60150..b3951f93 100644 --- a/test/TEX/PDFTEX.py +++ b/test/TEX/PDFTEX.py @@ -31,7 +31,6 @@ and that we can use this to wrap calls to the real latex utility. """ import os -import os.path import string import sys import TestSCons diff --git a/test/TEX/PDFTEXCOM.py b/test/TEX/PDFTEXCOM.py index f7601253..6c4b6aee 100644 --- a/test/TEX/PDFTEXCOM.py +++ b/test/TEX/PDFTEXCOM.py @@ -28,9 +28,8 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" Test the ability to configure the $PDFTEXCOM construction variable. """ -import os -import string import sys + import TestSCons _python_ = TestSCons._python_ diff --git a/test/TEX/PDFTEXCOMSTR.py b/test/TEX/PDFTEXCOMSTR.py index ac32ae1e..1332b647 100644 --- a/test/TEX/PDFTEXCOMSTR.py +++ b/test/TEX/PDFTEXCOMSTR.py @@ -30,9 +30,8 @@ Test that the $PDFTEXCOMSTR construction variable allows you to configure the C compilation output. """ -import os -import string import sys + import TestSCons _python_ = TestSCons._python_ diff --git a/test/TEX/PDFTEXFLAGS.py b/test/TEX/PDFTEXFLAGS.py index 94c54669..5ae18255 100644 --- a/test/TEX/PDFTEXFLAGS.py +++ b/test/TEX/PDFTEXFLAGS.py @@ -25,7 +25,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" import os -import os.path import string import sys import TestSCons diff --git a/test/TEX/TEX.py b/test/TEX/TEX.py index 5a0daec3..c78ad18a 100644 --- a/test/TEX/TEX.py +++ b/test/TEX/TEX.py @@ -31,7 +31,6 @@ and that we can use this to wrap calls to the real latex utility. """ import os -import os.path import string import sys import TestSCons diff --git a/test/TEX/TEXCOM.py b/test/TEX/TEXCOM.py index cf887a4f..c7a1b9ac 100644 --- a/test/TEX/TEXCOM.py +++ b/test/TEX/TEXCOM.py @@ -28,9 +28,8 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" Test the ability to configure the $TEXCOM construction variable. """ -import os -import string import sys + import TestSCons _python_ = TestSCons._python_ diff --git a/test/TEX/TEXCOMSTR.py b/test/TEX/TEXCOMSTR.py index 66c26020..124868bf 100644 --- a/test/TEX/TEXCOMSTR.py +++ b/test/TEX/TEXCOMSTR.py @@ -29,9 +29,8 @@ Test that the $TEXCOMSTR construction variable allows you to configure the C compilation output. """ -import os -import string import sys + import TestSCons _python_ = TestSCons._python_ diff --git a/test/TEX/TEXFLAGS.py b/test/TEX/TEXFLAGS.py index c27ffe52..6dcf95d2 100644 --- a/test/TEX/TEXFLAGS.py +++ b/test/TEX/TEXFLAGS.py @@ -25,7 +25,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" import os -import os.path import string import sys import TestSCons diff --git a/test/TEX/dryrun.py b/test/TEX/dryrun.py index 80458af4..cf7f9baf 100644 --- a/test/TEX/dryrun.py +++ b/test/TEX/dryrun.py @@ -31,9 +31,7 @@ and that we can use this to wrap calls to the real latex utility. """ import os -import os.path -import string -import sys + import TestSCons _python_ = TestSCons._python_ diff --git a/test/TEX/rename_result.py b/test/TEX/rename_result.py index e14d5029..11b4ccf2 100644 --- a/test/TEX/rename_result.py +++ b/test/TEX/rename_result.py @@ -30,9 +30,7 @@ target name provided by the user. """ import os -import os.path -import string -import sys + import TestSCons _python_ = TestSCons._python_ diff --git a/test/TEX/usepackage.py b/test/TEX/usepackage.py index 4be7f587..e23a8fcb 100644 --- a/test/TEX/usepackage.py +++ b/test/TEX/usepackage.py @@ -31,9 +31,7 @@ and that we can use this to wrap calls to the real latex utility. """ import os -import os.path -import string -import sys + import TestSCons _python_ = TestSCons._python_ diff --git a/test/Value.py b/test/Value.py index 01cb3706..ea6e682c 100644 --- a/test/Value.py +++ b/test/Value.py @@ -24,9 +24,9 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" -import os import re import sys + import TestSCons import TestCmd diff --git a/test/Variables/ListVariable.py b/test/Variables/ListVariable.py index 740698bb..8c6c777b 100644 --- a/test/Variables/ListVariable.py +++ b/test/Variables/ListVariable.py @@ -29,7 +29,6 @@ Test the ListVariable canned Variable type. """ import os -import os.path import string import TestSCons diff --git a/test/Variables/chdir.py b/test/Variables/chdir.py index ad907c66..87e9657c 100644 --- a/test/Variables/chdir.py +++ b/test/Variables/chdir.py @@ -51,7 +51,6 @@ print "VARIABLE =", repr(env['VARIABLE']) test.write(['bin', 'opts.cfg'], """\ import os -import os.path os.chdir(os.path.split(__name__)[0]) execfile('opts2.cfg') """) diff --git a/test/Variables/help.py b/test/Variables/help.py index dcea68e0..acfdbd67 100644 --- a/test/Variables/help.py +++ b/test/Variables/help.py @@ -29,7 +29,6 @@ Test the Variables help messages. """ import os.path -import string try: True, False diff --git a/test/Variables/import.py b/test/Variables/import.py index 899870ba..182ed263 100644 --- a/test/Variables/import.py +++ b/test/Variables/import.py @@ -52,7 +52,6 @@ print "VARIABLE =", env.get('VARIABLE') """ test.write(['bin', 'opts.cfg'], """\ -import sys from local_options import VARIABLE """ % locals()) diff --git a/test/VariantDir/VariantDir.py b/test/VariantDir/VariantDir.py index 3906cd75..813bb2f1 100644 --- a/test/VariantDir/VariantDir.py +++ b/test/VariantDir/VariantDir.py @@ -24,10 +24,8 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" -import os.path import string import sys -import time import TestSCons _exe = TestSCons._exe diff --git a/test/VariantDir/errors.py b/test/VariantDir/errors.py index 22a48218..80f47d53 100644 --- a/test/VariantDir/errors.py +++ b/test/VariantDir/errors.py @@ -31,7 +31,6 @@ is read-only. """ import os -import os.path import stat import sys import TestSCons diff --git a/test/Win32/bad-drive.py b/test/Win32/bad-drive.py index 49613869..5b473bcf 100644 --- a/test/Win32/bad-drive.py +++ b/test/Win32/bad-drive.py @@ -31,7 +31,6 @@ with an invalid drive letter. __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" import os -import os.path import string import sys diff --git a/test/Win32/default-drive.py b/test/Win32/default-drive.py index 94d83778..9c17c196 100644 --- a/test/Win32/default-drive.py +++ b/test/Win32/default-drive.py @@ -31,8 +31,6 @@ file's drive as the default. __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" import os -import os.path -import string import sys import TestSCons diff --git a/test/Win32/mingw.py b/test/Win32/mingw.py index fac89106..feb5373a 100644 --- a/test/Win32/mingw.py +++ b/test/Win32/mingw.py @@ -28,13 +28,12 @@ This tests the MinGW C/C++ compiler support. __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" -import TestSCons -import sys -import os.path import os -import TestCmd -import time import string +import sys + +import TestSCons +import TestCmd test = TestSCons.TestSCons(match = TestCmd.match_re_dotall) diff --git a/test/YACC/YACC.py b/test/YACC/YACC.py index bef959f2..a00d640d 100644 --- a/test/YACC/YACC.py +++ b/test/YACC/YACC.py @@ -25,7 +25,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" import os -import os.path import string import sys import TestSCons diff --git a/test/YACC/YACCFLAGS.py b/test/YACC/YACCFLAGS.py index 91b391b8..39b510aa 100644 --- a/test/YACC/YACCFLAGS.py +++ b/test/YACC/YACCFLAGS.py @@ -25,7 +25,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" import os -import os.path import string import sys import TestSCons diff --git a/test/ZIP/ZIP.py b/test/ZIP/ZIP.py index 646677d1..10f0efd8 100644 --- a/test/ZIP/ZIP.py +++ b/test/ZIP/ZIP.py @@ -25,7 +25,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" import os -import os.path import stat import string import sys diff --git a/test/ZIP/ZIPCOM.py b/test/ZIP/ZIPCOM.py index 460abe42..37af7583 100644 --- a/test/ZIP/ZIPCOM.py +++ b/test/ZIP/ZIPCOM.py @@ -28,9 +28,8 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" Test the ability to configure the $ZIPCOM construction variable. """ -import os -import string import sys + import TestSCons _python_ = TestSCons._python_ diff --git a/test/emitter.py b/test/emitter.py index a7f6b3fe..b76db7c9 100644 --- a/test/emitter.py +++ b/test/emitter.py @@ -26,7 +26,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" import TestSCons import os -import os.path test = TestSCons.TestSCons() diff --git a/test/exceptions.py b/test/exceptions.py index 12efdf0a..b51c1eac 100644 --- a/test/exceptions.py +++ b/test/exceptions.py @@ -24,11 +24,11 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" -import os import re import sys -import TestSCons + import TestCmd +import TestSCons _python_ = TestSCons._python_ diff --git a/test/expansion.py b/test/expansion.py index 0f721345..b438ff4a 100644 --- a/test/expansion.py +++ b/test/expansion.py @@ -29,8 +29,7 @@ Test construction variable expansion in Builder paths. """ import os.path -import sys -import time + import TestSCons _exe = TestSCons._exe diff --git a/test/explain/function-actions.py b/test/explain/function-actions.py index b28747dc..7e6a2d4d 100644 --- a/test/explain/function-actions.py +++ b/test/explain/function-actions.py @@ -29,9 +29,6 @@ Verify that --debug=explain correctly handles changes to actions that contain a list of function Actions. """ -import os.path -import string -import sys import TestSCons _python_ = TestSCons._python_ diff --git a/test/explain/save-info.py b/test/explain/save-info.py index b72b3fb8..f6ff39a2 100644 --- a/test/explain/save-info.py +++ b/test/explain/save-info.py @@ -28,9 +28,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" Verify that the --debug=explain information gets saved by default. """ -import os.path -import string -import sys import TestSCons _python_ = TestSCons._python_ diff --git a/test/ignore-command.py b/test/ignore-command.py index c1e6149a..17ab4d04 100644 --- a/test/ignore-command.py +++ b/test/ignore-command.py @@ -29,11 +29,7 @@ Test use of a preceding - to ignore the return value from a command. __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" import os -import os.path -import re -import string import sys -import TestCmd import TestSCons _python_ = TestSCons._python_ diff --git a/test/implicit/IMPLICIT_COMMAND_DEPENDENCIES.py b/test/implicit/IMPLICIT_COMMAND_DEPENDENCIES.py index e5021dac..9a018a3d 100644 --- a/test/implicit/IMPLICIT_COMMAND_DEPENDENCIES.py +++ b/test/implicit/IMPLICIT_COMMAND_DEPENDENCIES.py @@ -30,6 +30,8 @@ whether or not the implicit dependency on executed commands is added to targets. """ +import os + import TestSCons python = TestSCons.python @@ -44,7 +46,7 @@ import sys open(sys.argv[1], 'w').write('''\ #!/usr/bin/env %(python)s -import os.path +import os import string import sys fp = open(sys.argv[1], 'wb') diff --git a/test/long-lines.py b/test/long-lines.py index 340cd9ad..02551cec 100644 --- a/test/long-lines.py +++ b/test/long-lines.py @@ -25,9 +25,8 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" import os -import os.path -import string import sys + import TestSCons test = TestSCons.TestSCons() diff --git a/test/option--.py b/test/option--.py index 95403973..f6a16a20 100644 --- a/test/option--.py +++ b/test/option--.py @@ -25,8 +25,8 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" import os.path -import string import sys + import TestSCons _python_ = TestSCons._python_ diff --git a/test/option--C.py b/test/option--C.py index 47e067bf..8ce52a91 100644 --- a/test/option--C.py +++ b/test/option--C.py @@ -24,12 +24,12 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" -import TestSCons +import os import string -import sys -import os.path import types +import TestSCons + def match_normcase(lines, matches): if not type(lines) is types.ListType: lines = string.split(lines, "\n") diff --git a/test/option--I.py b/test/option--I.py index 0f422e6e..b7cc1f42 100644 --- a/test/option--I.py +++ b/test/option--I.py @@ -25,8 +25,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" import TestSCons -import string -import sys test = TestSCons.TestSCons() diff --git a/test/option--Q.py b/test/option--Q.py index f99031ce..ce9a161b 100644 --- a/test/option--Q.py +++ b/test/option--Q.py @@ -25,8 +25,8 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" import os.path -import string import sys + import TestSCons _python_ = TestSCons._python_ diff --git a/test/option--R.py b/test/option--R.py index c61167b4..7208e904 100644 --- a/test/option--R.py +++ b/test/option--R.py @@ -25,8 +25,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" import TestSCons -import string -import sys test = TestSCons.TestSCons() diff --git a/test/option--S.py b/test/option--S.py index fbe9128b..719241d4 100644 --- a/test/option--S.py +++ b/test/option--S.py @@ -25,8 +25,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" import TestSCons -import string -import sys test = TestSCons.TestSCons() diff --git a/test/option--W.py b/test/option--W.py index f6d07e86..8c4a6167 100644 --- a/test/option--W.py +++ b/test/option--W.py @@ -25,8 +25,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" import TestSCons -import string -import sys test = TestSCons.TestSCons() diff --git a/test/option--duplicate.py b/test/option--duplicate.py index c8874e7b..6c631b31 100644 --- a/test/option--duplicate.py +++ b/test/option--duplicate.py @@ -29,10 +29,7 @@ SConscript settable option. __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" -import string -import sys import os -import os.path import stat import TestSCons diff --git a/test/option--la.py b/test/option--la.py index 5f244d6f..af038e42 100644 --- a/test/option--la.py +++ b/test/option--la.py @@ -25,8 +25,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" import TestSCons -import string -import sys test = TestSCons.TestSCons() diff --git a/test/option--ld.py b/test/option--ld.py index ae02d77f..ad39d902 100644 --- a/test/option--ld.py +++ b/test/option--ld.py @@ -25,8 +25,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" import TestSCons -import string -import sys test = TestSCons.TestSCons() diff --git a/test/option--lw.py b/test/option--lw.py index 56d4bda5..6a8f07af 100644 --- a/test/option--lw.py +++ b/test/option--lw.py @@ -25,8 +25,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" import TestSCons -import string -import sys test = TestSCons.TestSCons() diff --git a/test/option--max-drift.py b/test/option--max-drift.py index 1ac077a6..6d820fe1 100644 --- a/test/option--max-drift.py +++ b/test/option--max-drift.py @@ -24,9 +24,7 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" -import os.path import os -import string import sys import TestSCons diff --git a/test/option--override.py b/test/option--override.py index 544a0b8d..c3459164 100644 --- a/test/option--override.py +++ b/test/option--override.py @@ -25,8 +25,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" import TestSCons -import string -import sys test = TestSCons.TestSCons() diff --git a/test/option--wf.py b/test/option--wf.py index e8bc7017..760a5cda 100644 --- a/test/option--wf.py +++ b/test/option--wf.py @@ -25,8 +25,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" import TestSCons -import string -import sys test = TestSCons.TestSCons() diff --git a/test/option--wuv.py b/test/option--wuv.py index 7fd731a1..34567465 100644 --- a/test/option--wuv.py +++ b/test/option--wuv.py @@ -25,8 +25,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" import TestSCons -import string -import sys test = TestSCons.TestSCons() diff --git a/test/option-b.py b/test/option-b.py index cdaf348b..495e933d 100644 --- a/test/option-b.py +++ b/test/option-b.py @@ -25,8 +25,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" import TestSCons -import string -import sys test = TestSCons.TestSCons() diff --git a/test/option-c.py b/test/option-c.py index e709709f..323c89dd 100644 --- a/test/option-c.py +++ b/test/option-c.py @@ -28,8 +28,9 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" Test various uses of the -c (clean) option. """ -import os.path +import os import sys + import TestSCons _python_ = TestSCons._python_ diff --git a/test/option-f.py b/test/option-f.py index a8c7c7b7..8fb585c5 100644 --- a/test/option-f.py +++ b/test/option-f.py @@ -24,8 +24,9 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" +import os + import TestSCons -import os.path test = TestSCons.TestSCons() diff --git a/test/option-l.py b/test/option-l.py index 65ec69b4..57659e4e 100644 --- a/test/option-l.py +++ b/test/option-l.py @@ -25,8 +25,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" import TestSCons -import string -import sys test = TestSCons.TestSCons() diff --git a/test/option-m.py b/test/option-m.py index 8ec28b71..f44f6f3e 100644 --- a/test/option-m.py +++ b/test/option-m.py @@ -25,8 +25,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" import TestSCons -import string -import sys test = TestSCons.TestSCons() diff --git a/test/option-n.py b/test/option-n.py index dd67d279..9f7391e3 100644 --- a/test/option-n.py +++ b/test/option-n.py @@ -40,10 +40,9 @@ This test verifies: __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" import os -import os.path import re -import string import sys + import TestCmd import TestSCons diff --git a/test/option-o.py b/test/option-o.py index caa3d768..d73ca516 100644 --- a/test/option-o.py +++ b/test/option-o.py @@ -25,8 +25,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" import TestSCons -import string -import sys test = TestSCons.TestSCons() diff --git a/test/option-p.py b/test/option-p.py index 52228efb..beb3a2f0 100644 --- a/test/option-p.py +++ b/test/option-p.py @@ -25,8 +25,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" import TestSCons -import string -import sys test = TestSCons.TestSCons() diff --git a/test/option-r.py b/test/option-r.py index 9770c9ab..42c08c45 100644 --- a/test/option-r.py +++ b/test/option-r.py @@ -25,8 +25,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" import TestSCons -import string -import sys test = TestSCons.TestSCons() diff --git a/test/option-s.py b/test/option-s.py index b3bde5f2..20f39fb7 100644 --- a/test/option-s.py +++ b/test/option-s.py @@ -25,8 +25,8 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" import os.path -import string import sys + import TestSCons _python_ = TestSCons._python_ diff --git a/test/option-t.py b/test/option-t.py index ac53b812..905f7d30 100644 --- a/test/option-t.py +++ b/test/option-t.py @@ -25,8 +25,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" import TestSCons -import string -import sys test = TestSCons.TestSCons() diff --git a/test/option-unknown.py b/test/option-unknown.py index 19ac9abe..bfe4cd8c 100644 --- a/test/option-unknown.py +++ b/test/option-unknown.py @@ -24,10 +24,7 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" -import TestCmd import TestSCons -import string -import sys test = TestSCons.TestSCons() diff --git a/test/option-v.py b/test/option-v.py index 970dbd43..b91e4d9b 100644 --- a/test/option-v.py +++ b/test/option-v.py @@ -26,9 +26,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" import TestCmd import TestSCons -import re -import string -import sys test = TestSCons.TestSCons(match = TestCmd.match_re) diff --git a/test/option/debug-count.py b/test/option/debug-count.py index d3013120..11ad66f1 100644 --- a/test/option/debug-count.py +++ b/test/option/debug-count.py @@ -28,11 +28,10 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" Test that the --debug=count option works. """ -import TestSCons -import sys import string import re -import time + +import TestSCons test = TestSCons.TestSCons() diff --git a/test/option/debug-findlibs.py b/test/option/debug-findlibs.py index 42204027..70fa5b81 100644 --- a/test/option/debug-findlibs.py +++ b/test/option/debug-findlibs.py @@ -24,11 +24,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" -import sys -import string -import re -import time - import TestSCons _python_ = TestSCons._python_ diff --git a/test/option/debug-includes.py b/test/option/debug-includes.py index b923306b..1b7d363d 100644 --- a/test/option/debug-includes.py +++ b/test/option/debug-includes.py @@ -30,9 +30,6 @@ dependencies of a target. """ import TestSCons -import sys -import re -import time test = TestSCons.TestSCons() diff --git a/test/option/debug-memory.py b/test/option/debug-memory.py index 9ed674e2..b130ab9a 100644 --- a/test/option/debug-memory.py +++ b/test/option/debug-memory.py @@ -28,11 +28,10 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" Test that the --debug=memory option works. """ -import TestSCons -import sys -import string import re -import time +import string + +import TestSCons test = TestSCons.TestSCons() diff --git a/test/option/debug-objects.py b/test/option/debug-objects.py index 33ec59de..1d3829a2 100644 --- a/test/option/debug-objects.py +++ b/test/option/debug-objects.py @@ -29,10 +29,6 @@ Test that the --debug=objects option works. """ import TestSCons -import sys -import string -import re -import time test = TestSCons.TestSCons() diff --git a/test/option/tree-all.py b/test/option/tree-all.py index d569b314..aa929369 100644 --- a/test/option/tree-all.py +++ b/test/option/tree-all.py @@ -32,8 +32,6 @@ complete dependencies of a target. import TestSCons import sys import string -import re -import time test = TestSCons.TestSCons() diff --git a/test/option/tree-derived.py b/test/option/tree-derived.py index 3f7cb456..3ec33d79 100644 --- a/test/option/tree-derived.py +++ b/test/option/tree-derived.py @@ -30,9 +30,6 @@ dependencies (sources or Depends()) of a target. """ import TestSCons -import sys -import re -import time test = TestSCons.TestSCons() diff --git a/test/option/tree-lib.py b/test/option/tree-lib.py index d1fdcd27..c9293c28 100644 --- a/test/option/tree-lib.py +++ b/test/option/tree-lib.py @@ -33,8 +33,6 @@ on disk.) Issue 1363: http://scons.tigris.org/issues/show_bug.cgi?id=1363 """ -import sys - import TestSCons test = TestSCons.TestSCons() diff --git a/test/overrides.py b/test/overrides.py index dabf689b..ac936d58 100644 --- a/test/overrides.py +++ b/test/overrides.py @@ -25,7 +25,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" import TestSCons -import sys test = TestSCons.TestSCons() diff --git a/test/packaging/guess-package-name.py b/test/packaging/guess-package-name.py index 5b4cd670..9c912480 100644 --- a/test/packaging/guess-package-name.py +++ b/test/packaging/guess-package-name.py @@ -33,7 +33,6 @@ Also overriding this default package name is tested Furthermore that targz is the default packager is tested. """ -import os import TestSCons python = TestSCons.python diff --git a/test/packaging/msi/explicit-target.py b/test/packaging/msi/explicit-target.py index 745f0c1b..e7b0c2d0 100644 --- a/test/packaging/msi/explicit-target.py +++ b/test/packaging/msi/explicit-target.py @@ -29,7 +29,6 @@ Test the ability to use a explicit target package name and the use of FindInstalledFiles() in conjuction with .msi packages. """ -import os import TestSCons python = TestSCons.python diff --git a/test/packaging/msi/package.py b/test/packaging/msi/package.py index e6ce6682..3fb4e6ee 100644 --- a/test/packaging/msi/package.py +++ b/test/packaging/msi/package.py @@ -28,7 +28,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" Test the ability to create a simple msi package. """ -import os import TestSCons python = TestSCons.python diff --git a/test/packaging/rpm/explicit-target.py b/test/packaging/rpm/explicit-target.py index b9fcc0fb..2949a2fe 100644 --- a/test/packaging/rpm/explicit-target.py +++ b/test/packaging/rpm/explicit-target.py @@ -28,7 +28,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" Test the ability to create a rpm package from a explicit target name. """ -import os import TestSCons _python_ = TestSCons._python_ diff --git a/test/packaging/tar/bz2.py b/test/packaging/tar/bz2.py index 938ac11a..3a12a9be 100644 --- a/test/packaging/tar/bz2.py +++ b/test/packaging/tar/bz2.py @@ -29,7 +29,6 @@ This tests the SRC bz2 packager, which does the following: - create a tar package from the specified files """ -import os import TestSCons python = TestSCons.python diff --git a/test/packaging/tar/gz.py b/test/packaging/tar/gz.py index 26ce60d6..6582ed26 100644 --- a/test/packaging/tar/gz.py +++ b/test/packaging/tar/gz.py @@ -29,7 +29,6 @@ This tests the SRC 'targz' packager, which does the following: - create a targz package containing the specified files. """ -import os import TestSCons python = TestSCons.python diff --git a/test/preserve-source.py b/test/preserve-source.py index 3c29828f..f7abc4cd 100644 --- a/test/preserve-source.py +++ b/test/preserve-source.py @@ -25,7 +25,7 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" import os.path -import sys + import TestSCons test = TestSCons.TestSCons() diff --git a/test/python-version.py b/test/python-version.py index a75ccd55..56f65b2b 100644 --- a/test/python-version.py +++ b/test/python-version.py @@ -32,7 +32,6 @@ of Python. import os import re import string -import sys import TestCmd import TestSCons diff --git a/test/redirection.py b/test/redirection.py index cededdbf..64756ff3 100644 --- a/test/redirection.py +++ b/test/redirection.py @@ -24,7 +24,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" -import os import TestSCons _python_ = TestSCons._python_ diff --git a/test/runtest/fallback.py b/test/runtest/fallback.py index 5e97f813..5ef23638 100644 --- a/test/runtest/fallback.py +++ b/test/runtest/fallback.py @@ -30,7 +30,6 @@ if it can't find qmtest on the $PATH. """ import os -import os.path import re import string diff --git a/test/runtest/python.py b/test/runtest/python.py index aa1af221..d26f98e2 100644 --- a/test/runtest/python.py +++ b/test/runtest/python.py @@ -29,8 +29,6 @@ Test that the -P option lets us specify a Python version to use. """ import os.path -import re -import sys if not hasattr(os.path, 'pardir'): os.path.pardir = '..' diff --git a/test/runtest/testlistfile.py b/test/runtest/testlistfile.py index 0ca822db..0c9d84c7 100644 --- a/test/runtest/testlistfile.py +++ b/test/runtest/testlistfile.py @@ -30,7 +30,6 @@ Test a list of tests to run in a file specified with the -f option. import os.path -import TestCmd import TestRuntest test_fail_py = os.path.join('test', 'fail.py') diff --git a/test/scons-time/run/config/scons.py b/test/scons-time/run/config/scons.py index 45ca3691..be34dde2 100644 --- a/test/scons-time/run/config/scons.py +++ b/test/scons-time/run/config/scons.py @@ -28,7 +28,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" Verify specifying an alternate SCons through a config file. """ -import os import TestSCons_time diff --git a/test/scons-time/unknown.py b/test/scons-time/unknown.py index 2fb673fe..cee07c4a 100644 --- a/test/scons-time/unknown.py +++ b/test/scons-time/unknown.py @@ -29,7 +29,6 @@ Verify that invoking scons-test with an unknown argument generates the appropriate error message and exits non-zero. """ -import os import TestSCons_time diff --git a/test/sconsign/corrupt.py b/test/sconsign/corrupt.py index fd46de47..c4d007cf 100644 --- a/test/sconsign/corrupt.py +++ b/test/sconsign/corrupt.py @@ -28,7 +28,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" Test that we get proper warnings when .sconsign* files are corrupt. """ -import os import TestSCons import TestCmd import cPickle diff --git a/test/sconsign/script/Configure.py b/test/sconsign/script/Configure.py index 19c8a1ca..a4cac588 100644 --- a/test/sconsign/script/Configure.py +++ b/test/sconsign/script/Configure.py @@ -29,7 +29,7 @@ Verify that we can print .sconsign files with Configure context info in them (which have different BuildInfo entries). """ -import os.path +import os import re import TestSCons diff --git a/test/signature-order.py b/test/signature-order.py index 6ec839d8..c97899f2 100644 --- a/test/signature-order.py +++ b/test/signature-order.py @@ -33,7 +33,6 @@ but """ -import sys import TestSCons _exe = TestSCons._exe diff --git a/test/silent-command.py b/test/silent-command.py index 476158a5..e370d21c 100644 --- a/test/silent-command.py +++ b/test/silent-command.py @@ -29,11 +29,8 @@ Test the use of a preceding @ to suppress printing a command. __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" import os -import os.path -import re -import string import sys -import TestCmd + import TestSCons _python_ = TestSCons._python_ diff --git a/test/special-filenames.py b/test/special-filenames.py index 11930e51..f41ae268 100644 --- a/test/special-filenames.py +++ b/test/special-filenames.py @@ -24,7 +24,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" -import os import string import sys diff --git a/test/timestamp-fallback.py b/test/timestamp-fallback.py index 07749951..1f544eab 100644 --- a/test/timestamp-fallback.py +++ b/test/timestamp-fallback.py @@ -31,7 +31,6 @@ hashlib and no underlying md5 module available. import imp import os -import os.path import TestSCons diff --git a/test/tool_args.py b/test/tool_args.py index f7682561..0bd1a11d 100644 --- a/test/tool_args.py +++ b/test/tool_args.py @@ -30,8 +30,7 @@ a Tool specification's generate() method. """ import os.path -import sys -import time + import TestSCons test = TestSCons.TestSCons() diff --git a/test/toolpath/basic.py b/test/toolpath/basic.py index 7e08f8a4..7c324b0f 100644 --- a/test/toolpath/basic.py +++ b/test/toolpath/basic.py @@ -25,8 +25,7 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" import os.path -import sys -import time + import TestSCons test = TestSCons.TestSCons()