diff options
| author | Steven Knight <knight@baldmt.com> | 2008-10-31 13:33:56 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2008-10-31 13:33:56 (GMT) |
| commit | 00e8490a90b0eafa3202d74291ede797bde16464 (patch) | |
| tree | 17ebc2495aa451e3bfbcff59c297c60fcebbb0c1 /src | |
| parent | 10c7fca471fccbb2178cba2b17dd2e0a39911d42 (diff) | |
| download | SCons-00e8490a90b0eafa3202d74291ede797bde16464.zip SCons-00e8490a90b0eafa3202d74291ede797bde16464.tar.gz SCons-00e8490a90b0eafa3202d74291ede797bde16464.tar.bz2 | |
Fix use of isinstance(..., tuple) so it works in older Python versions.
Diffstat (limited to 'src')
| -rw-r--r-- | src/engine/SCons/Script/Main.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/engine/SCons/Script/Main.py b/src/engine/SCons/Script/Main.py index 62a52d6..2d4e6a0 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: |