s4:python tests __init__.py - do not depend on "subprocess.CalledProcessError"

The class is not present in Python 2.4

Reviewed-by: Jelmer

1 files changed, 11 insertions, 6 deletions

diff --git a/source4/scripting/python/samba/tests/__init__.py b/source4/scripting/python/samba/tests/__init__.py
index ce2572fe8b..d9fbb15a02 100644
--- a/source4/scripting/python/samba/tests/__init__.py
+++ b/source4/scripting/python/samba/tests/__init__.py
@@ -123,15 +123,20 @@ class ValidNetbiosNameTests(TestCase):
         self.assertFalse(samba.valid_netbios_name("*BLA"))
 
 
-class BlackboxProcessError(subprocess.CalledProcessError):
-    """This exception is raised when a process run by check_output() returns
-    a non-zero exit status. Exception instance should contain
-    the exact exit code (S.returncode), command line (S.cmd),
-    process output (S.stdout) and process error stream (S.stderr)"""
+class BlackboxProcessError(Exception):
+    """This is raised when check_output() process returns a non-zero exit status
+
+    Exception instance should contain the exact exit code (S.returncode),
+    command line (S.cmd), process output (S.stdout) and process error stream
+    (S.stderr)
+    """
+
     def __init__(self, returncode, cmd, stdout, stderr):
-        super(BlackboxProcessError, self).__init__(returncode, cmd)
+        self.returncode = returncode
+        self.cmd = cmd
         self.stdout = stdout
         self.stderr = stderr
+
     def __str__(self):
         return "Command '%s'; exit status %d; stdout: '%s'; stderr: '%s'" % (self.cmd, self.returncode,
                                                                              self.stdout, self.stderr)