Remove more direct use of the Python C API

Author: QuLogic

src/_backend_agg.h

@@ -1232,11 +1232,11 @@ inline void RendererAgg::draw_gouraud_triangles(GCAgg &gc,
                                                 ColorArray &colors,
                                                 agg::trans_affine &trans)
 {
-    if (points.shape(0) && !check_trailing_shape(points, "points", 3, 2)) {
-        throw py::error_already_set();
+    if (points.shape(0)) {
+        check_trailing_shape(points, "points", 3, 2);
     }
-    if (colors.shape(0) && !check_trailing_shape(colors, "colors", 3, 4)) {
-        throw py::error_already_set();
+    if (colors.shape(0)) {
+        check_trailing_shape(colors, "colors", 3, 4);
     }
     if (points.shape(0) != colors.shape(0)) {
         throw py::value_error(

src/_path_wrapper.cpp

@@ -181,9 +181,7 @@ Py_affine_transform(py::array_t<double, py::array::c_style | py::array::forcecas
     if (vertices_arr.ndim() == 2) {
         auto vertices = vertices_arr.unchecked<2>();
 
-        if(!check_trailing_shape(vertices, "vertices", 2)) {
-            throw py::error_already_set();
-        }
+        check_trailing_shape(vertices, "vertices", 2);
 
         py::ssize_t dims[] = { vertices.shape(0), 2 };
         py::array_t<double> result(dims);

src/mplutils.h

@@ -48,74 +48,51 @@ enum {
     CLOSEPOLY = 0x4f
 };
 
-inline int prepare_and_add_type(PyTypeObject *type, PyObject *module)
-{
-    if (PyType_Ready(type)) {
-        return -1;
-    }
-    char const* ptr = strrchr(type->tp_name, '.');
-    if (!ptr) {
-        PyErr_SetString(PyExc_ValueError, "tp_name should be a qualified name");
-        return -1;
-    }
-    if (PyModule_AddObject(module, ptr + 1, (PyObject *)type)) {
-        return -1;
-    }
-    return 0;
-}
-
 #ifdef __cplusplus  // not for macosx.m
 // Check that array has shape (N, d1) or (N, d1, d2).  We cast d1, d2 to longs
 // so that we don't need to access the NPY_INTP_FMT macro here.
 #include <pybind11/pybind11.h>
 #include <pybind11/numpy.h>
 
 namespace py = pybind11;
+using namespace pybind11::literals;
 
 template<typename T>
-inline bool check_trailing_shape(T array, char const* name, long d1)
+inline void check_trailing_shape(T array, char const* name, long d1)
 {
     if (array.ndim() != 2) {
-        PyErr_Format(PyExc_ValueError,
-                     "Expected 2-dimensional array, got %ld",
-                     array.ndim());
-        return false;
+        throw py::value_error(
+            "Expected 2-dimensional array, got %d"_s.format(array.ndim()));
     }
     if (array.size() == 0) {
         // Sometimes things come through as atleast_2d, etc., but they're empty, so
         // don't bother enforcing the trailing shape.
-        return true;
+        return;
     }
     if (array.shape(1) != d1) {
-        PyErr_Format(PyExc_ValueError,
-                     "%s must have shape (N, %ld), got (%ld, %ld)",
-                     name, d1, array.shape(0), array.shape(1));
-        return false;
+        throw py::value_error(
+            "%s must have shape (N, %d), got (%d, %d)"_s.format(
+                name, d1, array.shape(0), array.shape(1)));
     }
-    return true;
 }
 
 template<typename T>
-inline bool check_trailing_shape(T array, char const* name, long d1, long d2)
+inline void check_trailing_shape(T array, char const* name, long d1, long d2)
 {
     if (array.ndim() != 3) {
-        PyErr_Format(PyExc_ValueError,
-                     "Expected 3-dimensional array, got %ld",
-                     array.ndim());
-        return false;
+        throw py::value_error(
+            "Expected 3-dimensional array, got %d"_s.format(array.ndim()));
     }
     if (array.size() == 0) {
         // Sometimes things come through as atleast_3d, etc., but they're empty, so
         // don't bother enforcing the trailing shape.
-        return true;
+        return;
     }
     if (array.shape(1) != d1 || array.shape(2) != d2) {
-        PyErr_Format(PyExc_ValueError,
-                     "%s must have shape (N, %ld, %ld), got (%ld, %ld, %ld)",
-                     name, d1, d2, array.shape(0), array.shape(1), array.shape(2));
-        return false;
+        throw py::value_error(
+            "%s must have shape (N, %d, %d), got (%d, %d, %d)"_s.format(
+                name, d1, d2, array.shape(0), array.shape(1), array.shape(2)));
     }
-    return true;
 }
 
 /* In most cases, code should use safe_first_shape(obj) instead of obj.shape(0), since

src/py_adaptors.h

@@ -101,19 +101,6 @@ class PathIterator
         m_iterator = 0;
     }
 
-    inline int
-    set(PyObject *vertices, PyObject *codes, bool should_simplify, double simplify_threshold)
-    {
-        try {
-            set(py::reinterpret_borrow<py::object>(vertices),
-                py::reinterpret_borrow<py::object>(codes),
-                should_simplify, simplify_threshold);
-        } catch(const py::error_already_set &) {
-            return 0;
-        }
-        return 1;
-    }
-
     inline void set(py::object vertices, py::object codes)
     {
         set(vertices, codes, false, 0.0);
@@ -186,16 +173,6 @@ class PathGenerator
         m_npaths = m_paths.size();
     }
 
-    int set(PyObject *obj)
-    {
-        try {
-            set(py::reinterpret_borrow<py::object>(obj));
-        } catch(const py::error_already_set &) {
-            return 0;
-        }
-        return 1;
-    }
-
     Py_ssize_t num_paths() const
     {
         return m_npaths;

src/py_converters.h

@@ -23,33 +23,25 @@ void convert_trans_affine(const py::object& transform, agg::trans_affine& affine
 
 inline auto convert_points(py::array_t<double> obj)
 {
-    if (!check_trailing_shape(obj, "points", 2)) {
-        throw py::error_already_set();
-    }
+    check_trailing_shape(obj, "points", 2);
     return obj.unchecked<2>();
 }
 
 inline auto convert_transforms(py::array_t<double> obj)
 {
-    if (!check_trailing_shape(obj, "transforms", 3, 3)) {
-        throw py::error_already_set();
-    }
+    check_trailing_shape(obj, "transforms", 3, 3);
     return obj.unchecked<3>();
 }
 
 inline auto convert_bboxes(py::array_t<double> obj)
 {
-    if (!check_trailing_shape(obj, "bbox array", 2, 2)) {
-        throw py::error_already_set();
-    }
+    check_trailing_shape(obj, "bbox array", 2, 2);
     return obj.unchecked<3>();
 }
 
 inline auto convert_colors(py::array_t<double> obj)
 {
-    if (!check_trailing_shape(obj, "colors", 4)) {
-        throw py::error_already_set();
-    }
+    check_trailing_shape(obj, "colors", 4);
     return obj.unchecked<2>();
 }