From a0ec8c213fd9e4d0feff2db943d2cd0c0488ca22 Mon Sep 17 00:00:00 2001 From: Steven Knight Date: Thu, 30 Oct 2008 13:05:32 +0000 Subject: Older Python portability: isinstance() only takes a single class. --- src/engine/SCons/Errors.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/engine/SCons/Errors.py b/src/engine/SCons/Errors.py index e663fb4..0ac20c4 100644 --- a/src/engine/SCons/Errors.py +++ b/src/engine/SCons/Errors.py @@ -154,7 +154,9 @@ def convert_to_BuildError(status, exc_info=None): status=status, # might be 0, OK here exitstatus=status, # might be 0, OK here exc_info=exc_info) - elif isinstance(status, (StopError, UserError)): + # TODO(1.5): + #elif isinstance(status, (StopError, UserError)): + elif isinstance(status, StopError) or isinstance(status, UserError): buildError = BuildError( errstr=str(status), status=2, -- cgit v0.12