Mercurial > pytave

diff __py_struct_from_dict__.cc @ 422:8247f298fd16

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Raise Octave errors instead of exceptions for conversion errors * Makefile.am (COMMON_SOURCE_FILES): Include oct-py-error.cc in the list. (PYTAVE_HEADER_FILES): Include oct-py-error.h in the list. * oct-py-error.cc, oct-py-error.h: New files defining error conditions. * oct-py-types.cc (pytave::extract_py_bool, pytave::extract_py_complex, pytave::extract_py_float, pytave::make_py_array, pytave::extract_py_scalar_map, pytave::extract_py_int64, pytave::extract_py_uint64, pytave::extract_py_str): Use new error condition functions instead of throwing exceptions. (pytave::make_py_array, pytave::make_py_numeric_value, pytave::make_py_tuple): Raise Octave error instead of throwing exceptions. * __py_struct_from_dict__.cc (F__py_int64_scalar_value__, F__py_uint64_scalar_value__): Remove exception handling logic. * pycall.cc (Fpycall): Remove conversion exception handlers. * pyeval.cc (Fpyeval): Likewise. * pyexec.cc (Fpyexec): Likewise. * exceptions.h (pytave::pytave_exception, pytave::octave_error_exception, pytave::octave_parse_exception, pytave::value_convert_exception, pytave::object_convert_exception, pytave::variable_name_exception): Delete no longer used exception types.
author Mike Miller <mtmiller@octave.org>
date Thu, 04 May 2017 17:13:38 -0700
parents 7864849e84c2
children
line wrap: on
line diff
--- a/__py_struct_from_dict__.cc	Thu May 04 13:22:20 2017 -0700
+++ b/__py_struct_from_dict__.cc	Thu May 04 17:13:38 2017 -0700
@@ -27,7 +27,6 @@
 #include <Python.h>
 #include <octave/oct.h>
 
-#include "exceptions.h"
 #include "oct-py-init.h"
 #include "oct-py-object.h"
 #include "oct-py-types.h"
@@ -88,24 +87,7 @@
   pytave::py_init ();
 
   pytave::python_object obj = pytave::pyobject_unwrap_object (args(0));
-  if (! obj)
-    error ("pyobject.int64: argument must be a valid Python object");
-
-  octave_int64 retval;
-
-  try
-    {
-      retval = pytave::extract_py_int64 (obj);
-    }
-  catch (pytave::object_convert_exception const &)
-    {
-      error ("pyobject.int64: argument must be a Python int or long object");
-    }
-  catch (pytave::error_already_set const &)
-    {
-      std::string message = pytave::fetch_exception_message ();
-      error ("pyobject.int64: %s", message.c_str ());
-    }
+  octave_int64 retval = pytave::extract_py_int64 (obj);
 
   return ovl (retval);
 }
@@ -140,24 +122,7 @@
   pytave::py_init ();
 
   pytave::python_object obj = pytave::pyobject_unwrap_object (args(0));
-  if (! obj)
-    error ("pyobject.uint64: argument must be a valid Python object");
-
-  octave_uint64 retval;
-
-  try
-    {
-      retval = pytave::extract_py_uint64 (obj);
-    }
-  catch (pytave::object_convert_exception const &)
-    {
-      error ("pyobject.uint64: argument must be a Python int or long object");
-    }
-  catch (pytave::error_already_set const &)
-    {
-      std::string message = pytave::fetch_exception_message ();
-      error ("pyobject.uint64: %s", message.c_str ());
-    }
+  octave_uint64 retval = pytave::extract_py_uint64 (obj);
 
   return ovl (retval);
 }