MAINT: Use the PyArray_(GET|SET)_ITEM functions where possible

10 files changed, 28 insertions, 32 deletions

diff --git a/numpy/core/src/multiarray/arrayobject.c b/numpy/core/src/multiarray/arrayobject.c
index 36d48af9f..1d4816d96 100644
--- a/numpy/core/src/multiarray/arrayobject.c
+++ b/numpy/core/src/multiarray/arrayobject.c
@@ -280,8 +280,7 @@ PyArray_CopyObject(PyArrayObject *dest, PyObject *src_object)
                 if (PyArray_SIZE(dest) == 1) {
                     Py_DECREF(dtype);
                     Py_DECREF(src_object);
-                    ret = PyArray_DESCR(dest)->f->setitem(src_object,
-                                                PyArray_DATA(dest), dest);
+                    ret = PyArray_SETITEM(dest, PyArray_DATA(dest), src_object);
                     return ret;
                 }
                 else {
@@ -292,8 +291,7 @@ PyArray_CopyObject(PyArrayObject *dest, PyObject *src_object)
                         Py_DECREF(src_object);
                         return -1;
                     }
-                    if (PyArray_DESCR(src)->f->setitem(src_object,
-                                                PyArray_DATA(src), src) < 0) {
+                    if (PyArray_SETITEM(src, PyArray_DATA(src), src_object) < 0) {
                         Py_DECREF(src_object);
                         Py_DECREF(src);
                         return -1;
diff --git a/numpy/core/src/multiarray/arraytypes.c.src b/numpy/core/src/multiarray/arraytypes.c.src
index 43dd101c5..567829342 100644
--- a/numpy/core/src/multiarray/arraytypes.c.src
+++ b/numpy/core/src/multiarray/arraytypes.c.src
@@ -687,7 +687,7 @@ VOID_getitem(void *input, void *vap)
             else {
                 PyArray_ENABLEFLAGS(ap, NPY_ARRAY_ALIGNED);
             }
-            PyTuple_SET_ITEM(ret, i, new->f->getitem(ip+offset, ap));
+            PyTuple_SET_ITEM(ret, i, PyArray_GETITEM(ap, ip+offset));
             ((PyArrayObject_fields *)ap)->flags = savedflags;
         }
         ((PyArrayObject_fields *)ap)->descr = descr;
@@ -907,7 +907,7 @@ VOID_setitem(PyObject *op, void *input, void *vap)
                     break;
                 }
                 /* use setitem to set this field */
-                if (PyArray_DESCR(ap)->f->setitem(item, ip + offset, ap) < 0) {
+                if (PyArray_SETITEM(ap, ip + offset, item) < 0) {
                     failed = 1;
                     break;
                 }
@@ -924,7 +924,7 @@ VOID_setitem(PyObject *op, void *input, void *vap)
                     break;
                 }
                 /* use setitem to set this field */
-                if (PyArray_DESCR(ap)->f->setitem(op, ip + offset, ap) < 0) {
+                if (PyArray_SETITEM(ap, ip + offset, op) < 0) {
                     failed = 1;
                     break;
                 }
diff --git a/numpy/core/src/multiarray/convert.c b/numpy/core/src/multiarray/convert.c
index 212da892d..ca30d3f88 100644
--- a/numpy/core/src/multiarray/convert.c
+++ b/numpy/core/src/multiarray/convert.c
@@ -86,7 +86,7 @@ recursive_tolist(PyArrayObject *self, char *dataptr, int startdim)
 
     /* Base case */
     if (startdim >= PyArray_NDIM(self)) {
-        return PyArray_DESCR(self)->f->getitem(dataptr,self);
+        return PyArray_GETITEM(self, dataptr);
     }
 
     n = PyArray_DIM(self, startdim);
@@ -222,7 +222,7 @@ PyArray_ToFile(PyArrayObject *self, FILE *fp, char *sep, char *format)
             PyArray_IterNew((PyObject *)self);
         n4 = (format ? strlen((const char *)format) : 0);
         while (it->index < it->size) {
-            obj = PyArray_DESCR(self)->f->getitem(it->dataptr, self);
+            obj = PyArray_GETITEM(self, it->dataptr);
             if (obj == NULL) {
                 Py_DECREF(it);
                 return -1;
diff --git a/numpy/core/src/multiarray/convert_datatype.c b/numpy/core/src/multiarray/convert_datatype.c
index e495f3160..bb01d875b 100644
--- a/numpy/core/src/multiarray/convert_datatype.c
+++ b/numpy/core/src/multiarray/convert_datatype.c
@@ -1945,7 +1945,7 @@ PyArray_Zero(PyArrayObject *arr)
     }
     storeflags = PyArray_FLAGS(arr);
     PyArray_ENABLEFLAGS(arr, NPY_ARRAY_BEHAVED);
-    ret = PyArray_DESCR(arr)->f->setitem(zero_obj, zeroval, arr);
+    ret = PyArray_SETITEM(arr, zeroval, zero_obj);
     ((PyArrayObject_fields *)arr)->flags = storeflags;
     if (ret < 0) {
         PyDataMem_FREE(zeroval);
@@ -1992,7 +1992,7 @@ PyArray_One(PyArrayObject *arr)
 
     storeflags = PyArray_FLAGS(arr);
     PyArray_ENABLEFLAGS(arr, NPY_ARRAY_BEHAVED);
-    ret = PyArray_DESCR(arr)->f->setitem(one_obj, oneval, arr);
+    ret = PyArray_SETITEM(arr, oneval, one_obj);
     ((PyArrayObject_fields *)arr)->flags = storeflags;
     if (ret < 0) {
         PyDataMem_FREE(oneval);
diff --git a/numpy/core/src/multiarray/ctors.c b/numpy/core/src/multiarray/ctors.c
index c9b3125ae..fb913d288 100644
--- a/numpy/core/src/multiarray/ctors.c
+++ b/numpy/core/src/multiarray/ctors.c
@@ -514,7 +514,7 @@ setArrayFromSequence(PyArrayObject *a, PyObject *s,
             }
             else {
                 char * b = (PyArray_BYTES(dst) + i * PyArray_STRIDES(dst)[0]);
-                res = PyArray_DESCR(dst)->f->setitem(o, b, dst);
+                res = PyArray_SETITEM(dst, b, o);
             }
             if (res < 0) {
                 Py_DECREF(o);
@@ -545,7 +545,7 @@ setArrayFromSequence(PyArrayObject *a, PyObject *s,
             }
             else {
                 char * b = (PyArray_BYTES(dst) + i * PyArray_STRIDES(dst)[0]);
-                res = PyArray_DESCR(dst)->f->setitem(o, b, dst);
+                res = PyArray_SETITEM(dst, b, o);
             }
             if (res < 0) {
                 Py_DECREF(seq);
@@ -1772,8 +1772,7 @@ PyArray_FromAny(PyObject *op, PyArray_Descr *newtype, int min_depth,
                 }
             }
             else {
-                if (PyArray_DESCR(ret)->f->setitem(op,
-                                            PyArray_DATA(ret), ret) < 0) {
+                if (PyArray_SETITEM(ret, PyArray_DATA(ret), op) < 0) {
                     Py_DECREF(ret);
                     ret = NULL;
                 }
@@ -3732,7 +3731,7 @@ PyArray_FromIter(PyObject *obj, PyArray_Descr *dtype, npy_intp count)
         PyArray_DIMS(ret)[0] = i + 1;
 
         if (((item = index2ptr(ret, i)) == NULL) ||
-                (PyArray_DESCR(ret)->f->setitem(value, item, ret) == -1)) {
+                PyArray_SETITEM(ret, item, value) == -1) {
             Py_DECREF(value);
             goto done;
         }
diff --git a/numpy/core/src/multiarray/item_selection.c b/numpy/core/src/multiarray/item_selection.c
index 21bcd6cad..811653e85 100644
--- a/numpy/core/src/multiarray/item_selection.c
+++ b/numpy/core/src/multiarray/item_selection.c
@@ -2383,7 +2383,7 @@ PyArray_MultiIndexGetItem(PyArrayObject *self, npy_intp *multi_index)
         data += ind * strides[idim];
     }
 
-    return PyArray_DESCR(self)->f->getitem(data, self);
+    return PyArray_GETITEM(self, data);
 }
 
 /*
@@ -2412,5 +2412,5 @@ PyArray_MultiIndexSetItem(PyArrayObject *self, npy_intp *multi_index,
         data += ind * strides[idim];
     }
 
-    return PyArray_DESCR(self)->f->setitem(obj, data, self);
+    return PyArray_SETITEM(self, data, obj);
 }
diff --git a/numpy/core/src/multiarray/iterators.c b/numpy/core/src/multiarray/iterators.c
index b8cf4edf6..9e6ed712c 100644
--- a/numpy/core/src/multiarray/iterators.c
+++ b/numpy/core/src/multiarray/iterators.c
@@ -917,7 +917,7 @@ iter_ass_subscript(PyArrayIterObject *self, PyObject *ind, PyObject *val)
     if (PyBool_Check(ind)) {
         retval = 0;
         if (PyObject_IsTrue(ind)) {
-            retval = type->f->setitem(val, self->dataptr, self->ao);
+            retval = PyArray_SETITEM(self->ao, self->dataptr, val);
         }
         goto finish;
     }
@@ -1803,7 +1803,7 @@ static char* _set_constant(PyArrayNeighborhoodIterObject* iter,
 
         storeflags = PyArray_FLAGS(ar->ao);
         PyArray_ENABLEFLAGS(ar->ao, NPY_ARRAY_BEHAVED);
-        st = PyArray_DESCR(ar->ao)->f->setitem((PyObject*)fill, ret, ar->ao);
+        st = PyArray_SETITEM(ar->ao, ret, (PyObject*)fill);
         ((PyArrayObject_fields *)ar->ao)->flags = storeflags;
 
         if (st < 0) {
diff --git a/numpy/core/src/multiarray/number.c b/numpy/core/src/multiarray/number.c
index 8d1e1a24c..08d177992 100644
--- a/numpy/core/src/multiarray/number.c
+++ b/numpy/core/src/multiarray/number.c
@@ -818,7 +818,7 @@ array_int(PyArrayObject *v)
                         " converted to Python scalars");
         return NULL;
     }
-    pv = PyArray_DESCR(v)->f->getitem(PyArray_DATA(v), v);
+    pv = PyArray_GETITEM(v, PyArray_DATA(v));
     if (pv == NULL) {
         return NULL;
     }
@@ -860,7 +860,7 @@ array_float(PyArrayObject *v)
                         "be converted to Python scalars");
         return NULL;
     }
-    pv = PyArray_DESCR(v)->f->getitem(PyArray_DATA(v), v);
+    pv = PyArray_GETITEM(v, PyArray_DATA(v));
     if (pv == NULL) {
         return NULL;
     }
@@ -903,7 +903,7 @@ array_long(PyArrayObject *v)
                         "be converted to Python scalars");
         return NULL;
     }
-    pv = PyArray_DESCR(v)->f->getitem(PyArray_DATA(v), v);
+    pv = PyArray_GETITEM(v, PyArray_DATA(v));
     if (pv == NULL) {
         return NULL;
     }
@@ -944,7 +944,7 @@ array_oct(PyArrayObject *v)
                         "be converted to Python scalars");
         return NULL;
     }
-    pv = PyArray_DESCR(v)->f->getitem(PyArray_DATA(v), v);
+    pv = PyArray_GETITEM(v, PyArray_DATA(v));
     if (pv == NULL) {
         return NULL;
     }
@@ -985,7 +985,7 @@ array_hex(PyArrayObject *v)
                         "be converted to Python scalars");
         return NULL;
     }
-    pv = PyArray_DESCR(v)->f->getitem(PyArray_DATA(v), v);
+    pv = PyArray_GETITEM(v, PyArray_DATA(v));
     if (pv == NULL) {
         return NULL;
     }
@@ -1033,7 +1033,7 @@ array_index(PyArrayObject *v)
             "only integer scalar arrays can be converted to a scalar index");
         return NULL;
     }
-    return PyArray_DESCR(v)->f->getitem(PyArray_DATA(v), v);
+    return PyArray_GETITEM(v, PyArray_DATA(v));
 }
 
 
diff --git a/numpy/core/src/multiarray/strfuncs.c b/numpy/core/src/multiarray/strfuncs.c
index 5a0d20335..f7980ffe0 100644
--- a/numpy/core/src/multiarray/strfuncs.c
+++ b/numpy/core/src/multiarray/strfuncs.c
@@ -66,7 +66,6 @@ static int
 dump_data(char **string, Py_ssize_t *n, Py_ssize_t *max_n, char *data, int nd,
           npy_intp *dimensions, npy_intp *strides, PyArrayObject* self)
 {
-    PyArray_Descr *descr=PyArray_DESCR(self);
     PyObject *op = NULL, *sp = NULL;
     char *ostring;
     npy_intp i, N, ret = 0;
@@ -79,7 +78,7 @@ dump_data(char **string, Py_ssize_t *n, Py_ssize_t *max_n, char *data, int nd,
     } while (0)
 
     if (nd == 0) {
-        if ((op = descr->f->getitem(data, self)) == NULL) {
+        if ((op = PyArray_GETITEM(self, data)) == NULL) {
             return -1;
         }
         sp = PyObject_Repr(op);
diff --git a/numpy/f2py/cfuncs.py b/numpy/f2py/cfuncs.py
index 6aeeec823..3b7f694d4 100644
--- a/numpy/f2py/cfuncs.py
+++ b/numpy/f2py/cfuncs.py
@@ -331,7 +331,7 @@ cppmacros['TRYPYARRAYTEMPLATE'] = """\
 /* New SciPy */
 #define TRYPYARRAYTEMPLATECHAR case NPY_STRING: *(char *)(PyArray_DATA(arr))=*v; break;
 #define TRYPYARRAYTEMPLATELONG case NPY_LONG: *(long *)(PyArray_DATA(arr))=*v; break;
-#define TRYPYARRAYTEMPLATEOBJECT case NPY_OBJECT: (PyArray_DESCR(arr)->f->setitem)(pyobj_from_ ## ctype ## 1(*v),PyArray_DATA(arr)); break;
+#define TRYPYARRAYTEMPLATEOBJECT case NPY_OBJECT: PyArray_SETITEM(arr,PyArray_DATA(arr),pyobj_from_ ## ctype ## 1(*v)); break;
 
 #define TRYPYARRAYTEMPLATE(ctype,typecode) \\
         PyArrayObject *arr = NULL;\\
@@ -357,7 +357,7 @@ cppmacros['TRYPYARRAYTEMPLATE'] = """\
                 case NPY_ULONGLONG: *(npy_ulonglong *)(PyArray_DATA(arr))=*v; break;\\
                 case NPY_LONGDOUBLE: *(npy_longdouble *)(PyArray_DATA(arr))=*v; break;\\
                 case NPY_CLONGDOUBLE: *(npy_longdouble *)(PyArray_DATA(arr))=*v; break;\\
-                case NPY_OBJECT: (PyArray_DESCR(arr)->f->setitem)(pyobj_from_ ## ctype ## 1(*v),PyArray_DATA(arr), arr); break;\\
+                case NPY_OBJECT: PyArray_SETITEM(arr, PyArray_DATA(arr), pyobj_from_ ## ctype ## 1(*v)); break;\\
         default: return -2;\\
         };\\
         return 1
@@ -365,7 +365,7 @@ cppmacros['TRYPYARRAYTEMPLATE'] = """\
 
 needs['TRYCOMPLEXPYARRAYTEMPLATE'] = ['PRINTPYOBJERR']
 cppmacros['TRYCOMPLEXPYARRAYTEMPLATE'] = """\
-#define TRYCOMPLEXPYARRAYTEMPLATEOBJECT case NPY_OBJECT: (PyArray_DESCR(arr)->f->setitem)(pyobj_from_complex_ ## ctype ## 1((*v)),PyArray_DATA(arr), arr); break;
+#define TRYCOMPLEXPYARRAYTEMPLATEOBJECT case NPY_OBJECT: PyArray_SETITEM(arr, PyArray_DATA(arr), pyobj_from_complex_ ## ctype ## 1((*v))); break;
 #define TRYCOMPLEXPYARRAYTEMPLATE(ctype,typecode)\\
         PyArrayObject *arr = NULL;\\
         if (!obj) return -2;\\
@@ -394,7 +394,7 @@ cppmacros['TRYCOMPLEXPYARRAYTEMPLATE'] = """\
                 case NPY_ULONGLONG: *(npy_ulonglong *)(PyArray_DATA(arr))=(*v).r; break;\\
                 case NPY_LONGDOUBLE: *(npy_longdouble *)(PyArray_DATA(arr))=(*v).r; break;\\
                 case NPY_CLONGDOUBLE: *(npy_longdouble *)(PyArray_DATA(arr))=(*v).r;*(npy_longdouble *)(PyArray_DATA(arr)+sizeof(npy_longdouble))=(*v).i;break;\\
-                case NPY_OBJECT: (PyArray_DESCR(arr)->f->setitem)(pyobj_from_complex_ ## ctype ## 1((*v)),PyArray_DATA(arr), arr); break;\\
+                case NPY_OBJECT: PyArray_SETITEM(arr, PyArray_DATA(arr), pyobj_from_complex_ ## ctype ## 1((*v))); break;\\
                 default: return -2;\\
         };\\
         return -1;