From 4056d7eaa993e3aa0b4b439d0f42275eba7aeb0d Mon Sep 17 00:00:00 2001 From: stevenknight Date: Fri, 31 Oct 2008 13:33:56 +0000 Subject: [PATCH] Fix use of isinstance(..., tuple) so it works in older Python versions. git-svn-id: http://scons.tigris.org/svn/scons/trunk@3753 fdb21ef1-2011-0410-befe-b5e4ea1792b1 --- src/engine/SCons/Script/Main.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/engine/SCons/Script/Main.py b/src/engine/SCons/Script/Main.py index 62a52d60..2d4e6a0b 100644 --- a/src/engine/SCons/Script/Main.py +++ b/src/engine/SCons/Script/Main.py @@ -265,9 +265,13 @@ class BuildTask(SCons.Taskmaster.Task): sys.stderr.write(errfmt % (nodename, buildError)) if (buildError.exc_info[2] and buildError.exc_info[1] and - not isinstance( - buildError.exc_info[1], - (EnvironmentError, SCons.Errors.StopError, SCons.Errors.UserError))): + # TODO(1.5) + #not isinstance( + # buildError.exc_info[1], + # (EnvironmentError, SCons.Errors.StopError, SCons.Errors.UserError))): + not isinstance(buildError.exc_info[1], EnvironmentError) and + not isinstance(buildError.exc_info[1], SCons.Errors.StopError) and + not isinstance(buildError.exc_info[1], SCons.Errors.UserError)): type, value, trace = buildError.exc_info traceback.print_exception(type, value, trace) elif tb and print_stacktrace: -- 2.26.2