From: W. Trevor King <wking@drexel.edu>
Date: Sun, 24 Oct 2010 14:04:24 +0000 (-0400)
Subject: Make pysawsim.invoke.CommandError picklable, and add doctest proof.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9f079d5baddf0dcbcf1c7fc68b20820fe81748ea;p=sawsim.git

Make pysawsim.invoke.CommandError picklable, and add doctest proof.
---

diff --git a/pysawsim/invoke.py b/pysawsim/invoke.py
index bb051d7..165701c 100644
--- a/pysawsim/invoke.py
+++ b/pysawsim/invoke.py
@@ -25,14 +25,40 @@ import sys
 
 
 class CommandError(Exception):
-    def __init__(self, command, status, stdout, stderr):
-        strerror = ["Command failed (%d):\n  %s\n" % (status, stderr),
-                    "while executing\n  %s" % command]
-        Exception.__init__(self, "\n".join(strerror))
+    """Represent errors in command execution.
+
+    Instances are picklable (for passing through `multiprocessing.Queue`\s).
+
+    >>> import pickle
+    >>> a = CommandError('somefunc', 1, '', 'could not find "somefunc"')
+    >>> x = pickle.dumps(a)
+    >>> b = pickle.loads(x)
+    >>> print b
+    Command failed (1):
+      could not find "somefunc"
+    <BLANKLINE>
+    while executing
+      somefunc
+    """
+    def __init__(self, command=None, status=None, stdout=None, stderr=None):
         self.command = command
         self.status = status
         self.stdout = stdout
         self.stderr = stderr
+        Exception.__init__(self, self.__str__())
+
+    def __getstate__(self):
+        return self.__dict__
+
+    def __setstate__(self, data):
+        self.__dict__.update(data)
+
+    def __str__(self):
+        return "\n".join([
+                "Command failed (%s):\n  %s\n" % (self.status, self.stderr),
+                "while executing\n  %s" % self.command,
+                ])
+
 
 def invoke(cmd_string, stdin=None, expect=(0,), cwd=None, verbose=False):
     """