Changeset 4d76711 in sasmodels for sasmodels/exception.py

Timestamp:

Apr 5, 2016 10:33:44 AM (8 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, release_v0.94, release_v0.95, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

3a45c2c, c4e7a5f

Parents:

cd0a808

Message:

adjust interface to sasview

File:

• sasmodels/exception.py (modified) (4 diffs)

sasmodels/exception.py

@@ -2 +2 @@
 Utility to add annotations to python exceptions.
 """
+import sys
 
 # Platform cruft: WindowsError is only defined on Windows.
@@ -13 +14 @@
         pass
 
-def annotate_exception(exc, msg):
+def annotate_exception(msg, exc=None):
     """
     Add an annotation to the current exception, which can then be forwarded
-    to the caller using a bare "raise" statement to reraise the annotated
-    exception.
+    to the caller using a bare "raise" statement to raise the annotated
+    exception.  If the exception *exc* is provided, then that exception is the
+    one that is annotated, otherwise *sys.exc_info* is used.
 
     Example::
@@ -24 +26 @@
         >>> try:
         ...    print(D['hello'])
-        ... except Exception as exc:
-        ...    annotate_exception(exc, "while accessing 'D'")
+        ... except:
+        ...    annotate_exception("while accessing 'D'")
         ...    raise
         Traceback (most recent call last):
@@ -31 +33 @@
         KeyError: "hello while accessing 'D'"
     """
+    if not exc:
+        exc = sys.exc_info()[1]
+
     # Can't extend WindowsError exceptions; instead raise a new exception.
     # TODO: try to incorporate current stack trace in the raised exception