Merge commit 'upstream/2.0.0'

1 files changed, 3 insertions, 5 deletions

diff --git a/src/engine/SCons/Errors.py b/src/engine/SCons/Errors.py
index 69b389a..542bc47 100644
--- a/src/engine/SCons/Errors.py
+++ b/src/engine/SCons/Errors.py
@@ -28,7 +28,7 @@ and user errors in SCons.
 
 """
 
-__revision__ = "src/engine/SCons/Errors.py 4720 2010/03/24 03:14:11 jars"
+__revision__ = "src/engine/SCons/Errors.py 5023 2010/06/14 22:05:46 scons"
 
 import SCons.Util
 
@@ -133,7 +133,7 @@ class ExplicitExit(Exception):
         self.node = node
         self.status = status
         self.exitstatus = status
-        apply(Exception.__init__, (self,) + args)
+        Exception.__init__(self, *args)
 
 def convert_to_BuildError(status, exc_info=None):
     """
@@ -157,9 +157,7 @@ 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)
-    # TODO(1.5):
-    #elif isinstance(status, (StopError, UserError)):
-    elif isinstance(status, StopError) or isinstance(status, UserError):
+    elif isinstance(status, (StopError, UserError)):
         buildError = BuildError(
             errstr=str(status),
             status=2,