diff oct-py-types.cc @ 423:6b9de18b4bdd

Eliminate remaining custom exception handling in favor of Octave errors * oct-py-error.cc, oct-py-error.h (pytave::error_python_exception): New function to generate an Octave error from an active Python error condition, based on pytave::fetch_exception_message. * oct-py-eval.cc (pytave::py_call_function, pytave::py_run_string_safe): Use it. * oct-py-types.cc (pytave::make_py_dict): Likewise. * oct-py-util.cc (pytave::py_objstore): Likewise. * pycall.cc (Fpycall): Remove exception handling logic. * pyeval.cc (Fpyeval): Likewise. * pyexec.cc (Fpyexec): Likewise. * exceptions.cc, exceptions.h: Delete. * Makefile.am (COMMON_SOURCE_FILES, PYTAVE_HEADER_FILES): Remove them.
author Mike Miller <mtmiller@octave.org>
date Thu, 04 May 2017 21:15:07 -0700
parents 8247f298fd16
children
line wrap: on
line diff
--- a/oct-py-types.cc	Thu May 04 17:13:38 2017 -0700
+++ b/oct-py-types.cc	Thu May 04 21:15:07 2017 -0700
@@ -31,7 +31,6 @@
 #include <octave/quit.h>
 #include <octave/ov-null-mat.h>
 
-#include "exceptions.h"
 #include "oct-py-error.h"
 #include "oct-py-eval.h"
 #include "oct-py-object.h"
@@ -361,7 +360,7 @@
         PyObject *item = py_implicitly_convert_argument (map.contents (p));
 
         if (PyDict_SetItem (dict, key, item) < 0)
-          throw pytave::error_already_set ();
+          error_python_exception ();
       }
 
     return dict;