Changeset 9e430d0 in sasmodels

Timestamp:

Mar 26, 2015 2:42:20 PM (9 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:

2c801fe

Parents:

f1b8c90

Message:

move exception annotation into its own module

Location:

sasmodels

Files:

• exception.py (added)
• model_test.py (modified) (1 diff)

sasmodels/model_test.py

@@ -51 +51 @@
 from .core import list_models, load_model_definition, load_model, HAVE_OPENCL
 from .core import make_kernel, call_kernel, call_ER, call_VR
-
-
-def annotate_exception(exc, msg):
-    """
-    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.
-    Example::
-        >>> D = {}
-        >>> try:
-        ...    print D['hello']
-        ... except Exception,exc:
-        ...    annotate_exception(exc, "while accessing 'D'")
-        ...    raise
-        Traceback (most recent call last):
-            ...
-        KeyError: "hello while accessing 'D'"
-    """
-    args = exc.args
-    if not args:
-        exc.args = (msg,)
-    else:
-        try:
-            arg0 = " ".join((args[0],msg))
-            exc.args = tuple([arg0] + list(args[1:]))
-        except:
-            exc.args = (" ".join((str(exc),msg)),)
+from .exception import annotate_exception