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

diff --git a/src/engine/SCons/Script/Main.py b/src/engine/SCons/Script/Main.py
index 62a52d60b0f369c028a9bc39e051d44430cd44ee..2d4e6a0b627133e8b7cc644b7c553a4de856bf6d 100644 (file)
--- 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: