diff options
| author | Greg Noel <GregNoel@tigris.org> | 2010-04-24 05:51:13 +0000 |
|---|---|---|
| committer | Greg Noel <GregNoel@tigris.org> | 2010-04-24 05:51:13 +0000 |
| commit | 6a372812448d3462ac91d2c392f323b93df7e383 (patch) | |
| tree | a4b9f900e52561a91e0c4509dc6c692492996b7f /test/Actions | |
| parent | f7ac1212e72b65e2840b9b116b962e3872e30e8e (diff) | |
| download | scons-6a372812448d3462ac91d2c392f323b93df7e383.tar.gz | |
http://scons.tigris.org/issues/show_bug.cgi?id=2345
Comb out all code that supported earlier versions of Python. Most such
code is in snippets of only a few lines and can be identified by having
a Python version string in it. Such snippets add up; this combing pass
probably got rid of over 500 lines of code.
Diffstat (limited to 'test/Actions')
| -rw-r--r-- | test/Actions/function.py | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/test/Actions/function.py b/test/Actions/function.py index 20391979..4bde5250 100644 --- a/test/Actions/function.py +++ b/test/Actions/function.py @@ -158,25 +158,16 @@ scons: `.' is up to date. scons: done building targets. """ -import sys -if sys.version[:3] == '2.1': - expectedStderr = """\ -%s:79: SyntaxWarning: local name 'x' in 'a' shadows use of 'x' as global in nested scope 'b' - def a(): -""" % test.workpath('SConstruct') -else: - expectedStderr = "" - -def runtest(arguments, expectedOutFile, expectedRebuild=True, stderr=expectedStderr): +def runtest(arguments, expectedOutFile, expectedRebuild=True, stderr=""): test.run(arguments=arguments, stdout=expectedRebuild and rebuildstr or nobuildstr, - stderr=expectedStderr) + stderr="") test.must_match('Out.gen.h', expectedOutFile) - # Should not be rebuild when ran a second time with the same + # Should not be rebuild when run a second time with the same # arguments. - test.run(arguments = arguments, stdout=nobuildstr, stderr=expectedStderr) + test.run(arguments = arguments, stdout=nobuildstr, stderr="") test.must_match('Out.gen.h', expectedOutFile) |