Merge pull request #212 in LCL/wolframclientforpython from bugfix/380845-exception-dispatch to master

* commit '9eabf923d2fea0a721e538557bc2eda82005544f':
  adding hooks for databases
  adding exception_class

Author: crazyeng

wolframclient/language/decorators.py

@@ -16,7 +16,7 @@
 
 
 def safe_wl_execute(
-    function, args=(), opts={}, export_opts={}, exception_class=WolframLanguageException
+    function, args=(), opts={}, export_opts={}, exception_class=None
 ):
 
     __traceback_hidden_variables__ = True
@@ -37,7 +37,7 @@ def safe_wl_execute(
                     except Exception:
                         pass
 
-                if exception_class is WolframLanguageException:
+                if not exception_class or exception_class is WolframLanguageException:
                     return export(
                         WolframLanguageException(export_exception, exec_info=sys.exc_info()),
                         **export_opts
@@ -84,12 +84,16 @@ def safe_wl_execute(
                 ]
 
 
-def to_wl(**export_opts):
+def to_wl(exception_class=None, **export_opts):
     def outer(function):
         @wraps(function)
         def inner(*args, **opts):
             return safe_wl_execute(
-                function=function, args=args, opts=opts, export_opts=export_opts
+                function=function,
+                args=args,
+                opts=opts,
+                export_opts=export_opts,
+                exception_class=exception_class,
             )
 
         return inner

wolframclient/utils/externalevaluate.py

@@ -188,11 +188,12 @@ def start_zmq_loop(
     redirect_stdout=True,
     export_kwargs=EXPORT_KWARGS,
     evaluate_message=evaluate_message,
+    exception_class=None,
     consumer=None,
     **opts
 ):
 
-    handler = to_wl(**export_kwargs)(handle_message)
+    handler = to_wl(exception_class=exception_class, **export_kwargs)(handle_message)
 
     socket = start_zmq_instance(**opts)