From: stevenknight <stevenknight@fdb21ef1-2011-0410-befe-b5e4ea1792b1>
Date: Wed, 24 Sep 2008 15:53:30 +0000 (+0000)
Subject: Python 1.5 portability in test/Execute.py.
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=a18e7c818f846ddf98200b9cce672a7e95ab2c49;p=scons.git

Python 1.5 portability in test/Execute.py.


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

diff --git a/test/Execute.py b/test/Execute.py
index 1ff45e8c..19583ca4 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