summaryrefslogtreecommitdiff
path: root/test/Execute.py
diff options
context:
space:
mode:
authorGreg Noel <GregNoel@tigris.org>2010-04-24 05:51:13 +0000
committerGreg Noel <GregNoel@tigris.org>2010-04-24 05:51:13 +0000
commit6a372812448d3462ac91d2c392f323b93df7e383 (patch)
treea4b9f900e52561a91e0c4509dc6c692492996b7f /test/Execute.py
parentf7ac1212e72b65e2840b9b116b962e3872e30e8e (diff)
downloadscons-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/Execute.py')
-rw-r--r--test/Execute.py12
1 files changed, 1 insertions, 11 deletions
diff --git a/test/Execute.py b/test/Execute.py
index 409594cb..4caa4c47 100644
--- a/test/Execute.py
+++ b/test/Execute.py
@@ -90,17 +90,7 @@ scons: *** Error 2
scons: *** nonexistent.in/*.*: The system cannot find the path specified
"""
else:
- # TODO(1.5): the underlying shutil.copytree() call doesn't
- # add the nonexistent file name to the exception it throws.
- # This goes away soon, so just accomodate the difference.
- if sys.version[:3] == '1.5':
- expect = """\
-scons: *** Error 1
-scons: *** Error 2
-scons: *** No such file or directory
-"""
- else:
- expect = """\
+ expect = """\
scons: *** Error 1
scons: *** Error 2
scons: *** nonexistent.in: No such file or directory