From b0306e45a4af043aff96c93ecb82f1f7a17c6e37 Mon Sep 17 00:00:00 2001 From: Steven Knight Date: Wed, 24 Sep 2008 15:53:30 +0000 Subject: Python 1.5 portability in test/Execute.py. --- test/Execute.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/test/Execute.py b/test/Execute.py index 1ff45e8..19583ca 100644 --- a/test/Execute.py +++ b/test/Execute.py @@ -90,7 +90,17 @@ scons: *** Error 2 scons: *** nonexistent.in/*.*: The system cannot find the path specified """ else: - expect = """\ + # 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 = """\ scons: *** Error 1 scons: *** Error 2 scons: *** nonexistent.in: No such file or directory -- cgit v0.12