STY: Indentation, break lines, replace 1 by METH_VARARGS, whitespace.

7 files changed, 314 insertions, 214 deletions

diff --git a/numpy/core/src/multiarray/descriptor.c b/numpy/core/src/multiarray/descriptor.c
index 84a6614cc..b9d5501c2 100644
--- a/numpy/core/src/multiarray/descriptor.c
+++ b/numpy/core/src/multiarray/descriptor.c
@@ -2490,11 +2490,14 @@ arraydescr_newbyteorder(PyArray_Descr *self, PyObject *args)
 static PyMethodDef arraydescr_methods[] = {
     /* for pickling */
     {"__reduce__",
-        (PyCFunction)arraydescr_reduce, METH_VARARGS, NULL},
+        (PyCFunction)arraydescr_reduce,
+        METH_VARARGS, NULL},
     {"__setstate__",
-        (PyCFunction)arraydescr_setstate, METH_VARARGS, NULL},
+        (PyCFunction)arraydescr_setstate,
+        METH_VARARGS, NULL},
     {"newbyteorder",
-        (PyCFunction)arraydescr_newbyteorder, METH_VARARGS, NULL},
+        (PyCFunction)arraydescr_newbyteorder,
+        METH_VARARGS, NULL},
     {NULL, NULL, 0, NULL}           /* sentinel */
 };
 
diff --git a/numpy/core/src/multiarray/flagsobject.c b/numpy/core/src/multiarray/flagsobject.c
index 9d7faa2a1..3155929cf 100644
--- a/numpy/core/src/multiarray/flagsobject.c
+++ b/numpy/core/src/multiarray/flagsobject.c
@@ -304,59 +304,59 @@ static PyGetSetDef arrayflags_getsets[] = {
     {"contiguous",
         (getter)arrayflags_contiguous_get,
         NULL,
-        "", NULL},
+        NULL, NULL},
     {"c_contiguous",
         (getter)arrayflags_contiguous_get,
         NULL,
-        "", NULL},
+        NULL, NULL},
     {"f_contiguous",
         (getter)arrayflags_fortran_get,
         NULL,
-        "", NULL},
+        NULL, NULL},
     {"fortran",
         (getter)arrayflags_fortran_get,
         NULL,
-        "", NULL},
+        NULL, NULL},
     {"updateifcopy",
         (getter)arrayflags_updateifcopy_get,
         (setter)arrayflags_updateifcopy_set,
-        "", NULL},
+        NULL, NULL},
     {"owndata",
         (getter)arrayflags_owndata_get,
         NULL,
-        "", NULL},
+        NULL, NULL},
     {"aligned",
         (getter)arrayflags_aligned_get,
         (setter)arrayflags_aligned_set,
-        "", NULL},
+        NULL, NULL},
     {"writeable",
         (getter)arrayflags_writeable_get,
         (setter)arrayflags_writeable_set,
-        "", NULL},
+        NULL, NULL},
     {"fnc",
         (getter)arrayflags_fnc_get,
         NULL,
-        "", NULL},
+        NULL, NULL},
     {"forc",
         (getter)arrayflags_forc_get,
         NULL,
-        "", NULL},
+        NULL, NULL},
     {"behaved",
         (getter)arrayflags_behaved_get,
         NULL,
-        "", NULL},
+        NULL, NULL},
     {"carray",
         (getter)arrayflags_carray_get,
         NULL,
-        "", NULL},
+        NULL, NULL},
     {"farray",
         (getter)arrayflags_farray_get,
         NULL,
-        "", NULL},
+        NULL, NULL},
     {"num",
         (getter)arrayflags_num_get,
         NULL,
-        "", NULL},
+        NULL, NULL},
     {NULL, NULL, NULL, NULL, NULL},
 };
 
diff --git a/numpy/core/src/multiarray/getset.c b/numpy/core/src/multiarray/getset.c
index 6e580bfe1..bb80aadf8 100644
--- a/numpy/core/src/multiarray/getset.c
+++ b/numpy/core/src/multiarray/getset.c
@@ -608,7 +608,7 @@ _get_part(PyArrayObject *self, int imag)
 }
 
 /* For Object arrays, we need to get and set the
-   real part of each element. 
+   real part of each element.
  */
 
 static PyObject *
@@ -655,8 +655,8 @@ array_real_set(PyArrayObject *self, PyObject *val)
     return rint;
 }
 
-/* For Object arrays we need to get 
-   and set the imaginary part of 
+/* For Object arrays we need to get
+   and set the imaginary part of
    each element
 */
 
@@ -810,69 +810,81 @@ array_finalize_get(PyArrayObject *NPY_UNUSED(self))
 
 NPY_NO_EXPORT PyGetSetDef array_getsetlist[] = {
     {"ndim",
-     (getter)array_ndim_get,
-     NULL, NULL, NULL},
+        (getter)array_ndim_get,
+        NULL,
+        NULL, NULL},
     {"flags",
-     (getter)array_flags_get,
-     NULL, NULL, NULL},
+        (getter)array_flags_get,
+        NULL,
+        NULL, NULL},
     {"shape",
-     (getter)array_shape_get,
-     (setter)array_shape_set,
-     NULL, NULL},
+        (getter)array_shape_get,
+        (setter)array_shape_set,
+        NULL, NULL},
     {"strides",
-     (getter)array_strides_get,
-     (setter)array_strides_set,
-     NULL, NULL},
+        (getter)array_strides_get,
+        (setter)array_strides_set,
+        NULL, NULL},
     {"data",
-     (getter)array_data_get,
-     (setter)array_data_set,
-     NULL, NULL},
+        (getter)array_data_get,
+        (setter)array_data_set,
+        NULL, NULL},
     {"itemsize",
-     (getter)array_itemsize_get,
-     NULL, NULL, NULL},
+        (getter)array_itemsize_get,
+        NULL,
+        NULL, NULL},
     {"size",
-     (getter)array_size_get,
-     NULL, NULL, NULL},
+        (getter)array_size_get,
+        NULL,
+        NULL, NULL},
     {"nbytes",
-     (getter)array_nbytes_get,
-     NULL, NULL, NULL},
+        (getter)array_nbytes_get,
+        NULL,
+        NULL, NULL},
     {"base",
-     (getter)array_base_get,
-     NULL, NULL, NULL},
+        (getter)array_base_get,
+        NULL,
+        NULL, NULL},
     {"dtype",
-     (getter)array_descr_get,
-     (setter)array_descr_set,
-     NULL, NULL},
+        (getter)array_descr_get,
+        (setter)array_descr_set,
+        NULL, NULL},
     {"real",
-     (getter)array_real_get,
-     (setter)array_real_set,
-     NULL, NULL},
+        (getter)array_real_get,
+        (setter)array_real_set,
+        NULL, NULL},
     {"imag",
-     (getter)array_imag_get,
-     (setter)array_imag_set,
-     NULL, NULL},
+        (getter)array_imag_get,
+        (setter)array_imag_set,
+        NULL, NULL},
     {"flat",
-     (getter)array_flat_get,
-     (setter)array_flat_set,
-     NULL, NULL},
+        (getter)array_flat_get,
+        (setter)array_flat_set,
+        NULL, NULL},
     {"ctypes",
-     (getter)array_ctypes_get,
-     NULL, NULL, NULL},
-    {"T",
-     (getter)array_transpose_get,
-     NULL, NULL, NULL},
+        (getter)array_ctypes_get,
+        NULL,
+        NULL, NULL},
+    {   "T",
+        (getter)array_transpose_get,
+        NULL,
+        NULL, NULL},
     {"__array_interface__",
-     (getter)array_interface_get,
-     NULL, NULL, NULL},
+        (getter)array_interface_get,
+        NULL,
+        NULL, NULL},
     {"__array_struct__",
-     (getter)array_struct_get,
-     NULL, NULL, NULL},
+        (getter)array_struct_get,
+        NULL,
+        NULL, NULL},
     {"__array_priority__",
-     (getter)array_priority_get,
-     NULL, NULL, NULL},
+        (getter)array_priority_get,
+        NULL,
+        NULL, NULL},
     {"__array_finalize__",
-     (getter)array_finalize_get,
-     NULL, NULL, NULL},
+        (getter)array_finalize_get,
+        NULL,
+        NULL, NULL},
     {NULL, NULL, NULL, NULL, NULL},  /* Sentinel */
 };
 
diff --git a/numpy/core/src/multiarray/iterators.c b/numpy/core/src/multiarray/iterators.c
index 1717964d5..58b6e2a07 100644
--- a/numpy/core/src/multiarray/iterators.c
+++ b/numpy/core/src/multiarray/iterators.c
@@ -1180,8 +1180,12 @@ iter_copy(PyArrayIterObject *it, PyObject *args)
 
 static PyMethodDef iter_methods[] = {
     /* to get array */
-    {"__array__", (PyCFunction)iter_array, 1, NULL},
-    {"copy", (PyCFunction)iter_copy, 1, NULL},
+    {"__array__",
+        (PyCFunction)iter_array,
+        METH_VARARGS, NULL},
+    {"copy",
+        (PyCFunction)iter_copy,
+        METH_VARARGS, NULL},
     {NULL, NULL, 0, NULL}           /* sentinel */
 };
 
@@ -1201,8 +1205,14 @@ iter_richcompare(PyArrayIterObject *self, PyObject *other, int cmp_op)
 
 
 static PyMemberDef iter_members[] = {
-    {"base", T_OBJECT, offsetof(PyArrayIterObject, ao), READONLY, NULL},
-    {"index", T_INT, offsetof(PyArrayIterObject, index), READONLY, NULL},
+    {"base",
+        T_OBJECT,
+        offsetof(PyArrayIterObject, ao),
+        READONLY, NULL},
+    {"index",
+        T_INT,
+        offsetof(PyArrayIterObject, index),
+        READONLY, NULL},
     {NULL, 0, 0, 0, NULL},
 };
 
@@ -1233,8 +1243,9 @@ iter_coords_get(PyArrayIterObject *self)
 
 static PyGetSetDef iter_getsets[] = {
     {"coords",
-     (getter)iter_coords_get,
-     NULL, NULL, NULL},
+        (getter)iter_coords_get,
+        NULL,
+        NULL, NULL},
     {NULL, NULL, NULL, NULL, NULL},
 };
 
@@ -1666,24 +1677,33 @@ arraymultiter_iters_get(PyArrayMultiIterObject *self)
 
 static PyGetSetDef arraymultiter_getsetlist[] = {
     {"size",
-     (getter)arraymultiter_size_get,
-     NULL, NULL, NULL},
+        (getter)arraymultiter_size_get,
+        NULL,
+        NULL, NULL},
     {"index",
-     (getter)arraymultiter_index_get,
-     NULL, NULL, NULL},
+        (getter)arraymultiter_index_get,
+        NULL,
+        NULL, NULL},
     {"shape",
-     (getter)arraymultiter_shape_get,
-     NULL, NULL, NULL},
+        (getter)arraymultiter_shape_get,
+        NULL,
+        NULL, NULL},
     {"iters",
-     (getter)arraymultiter_iters_get,
-     NULL, NULL, NULL},
+        (getter)arraymultiter_iters_get,
+        NULL,
+        NULL, NULL},
     {NULL, NULL, NULL, NULL, NULL},
 };
 
 static PyMemberDef arraymultiter_members[] = {
-    {"numiter", T_INT, offsetof(PyArrayMultiIterObject, numiter),
-     READONLY, NULL},
-    {"nd", T_INT, offsetof(PyArrayMultiIterObject, nd), READONLY, NULL},
+    {"numiter",
+        T_INT,
+        offsetof(PyArrayMultiIterObject, numiter),
+        READONLY, NULL},
+    {"nd",
+        T_INT,
+        offsetof(PyArrayMultiIterObject, nd),
+        READONLY, NULL},
     {NULL, 0, 0, 0, NULL},
 };
 
@@ -1699,8 +1719,10 @@ arraymultiter_reset(PyArrayMultiIterObject *self, PyObject *args)
 }
 
 static PyMethodDef arraymultiter_methods[] = {
-    {"reset", (PyCFunction) arraymultiter_reset, METH_VARARGS, NULL},
-    {NULL, NULL, 0, NULL},
+    {"reset",
+        (PyCFunction) arraymultiter_reset,
+        METH_VARARGS, NULL},
+    {NULL, NULL, 0, NULL},      /* sentinal */
 };
 
 NPY_NO_EXPORT PyTypeObject PyArrayMultiIter_Type = {
diff --git a/numpy/core/src/multiarray/methods.c b/numpy/core/src/multiarray/methods.c
index 185e408cb..10b3cc6ee 100644
--- a/numpy/core/src/multiarray/methods.c
+++ b/numpy/core/src/multiarray/methods.c
@@ -2094,130 +2094,189 @@ array_newbyteorder(PyArrayObject *self, PyObject *args)
 NPY_NO_EXPORT PyMethodDef array_methods[] = {
 
     /* for subtypes */
-    {"__array__", (PyCFunction)array_getarray,
-         METH_VARARGS, NULL},
-    {"__array_prepare__", (PyCFunction)array_preparearray,
-         METH_VARARGS, NULL},
-    {"__array_wrap__", (PyCFunction)array_wraparray,
-         METH_VARARGS, NULL},
+    {"__array__",
+        (PyCFunction)array_getarray,
+        METH_VARARGS, NULL},
+    {"__array_prepare__",
+        (PyCFunction)array_preparearray,
+        METH_VARARGS, NULL},
+    {"__array_wrap__",
+        (PyCFunction)array_wraparray,
+        METH_VARARGS, NULL},
 
     /* for the copy module */
-    {"__copy__", (PyCFunction)array_copy,
-         METH_VARARGS, NULL},
-    {"__deepcopy__", (PyCFunction)array_deepcopy,
-         METH_VARARGS, NULL},
+    {"__copy__",
+        (PyCFunction)array_copy,
+        METH_VARARGS, NULL},
+    {"__deepcopy__",
+        (PyCFunction)array_deepcopy,
+        METH_VARARGS, NULL},
 
     /* for Pickling */
-    {"__reduce__", (PyCFunction) array_reduce,
-         METH_VARARGS, NULL},
-    {"__setstate__", (PyCFunction) array_setstate,
-         METH_VARARGS, NULL},
-    {"dumps", (PyCFunction) array_dumps,
-         METH_VARARGS, NULL},
-    {"dump", (PyCFunction) array_dump,
-         METH_VARARGS, NULL},
+    {"__reduce__",
+        (PyCFunction) array_reduce,
+        METH_VARARGS, NULL},
+    {"__setstate__",
+        (PyCFunction) array_setstate,
+        METH_VARARGS, NULL},
+    {"dumps",
+        (PyCFunction) array_dumps,
+        METH_VARARGS, NULL},
+    {"dump",
+        (PyCFunction) array_dump,
+        METH_VARARGS, NULL},
 
     /* Original and Extended methods added 2005 */
-    {"all", (PyCFunction)array_all,
-         METH_VARARGS | METH_KEYWORDS, NULL},
-    {"any", (PyCFunction)array_any,
-         METH_VARARGS | METH_KEYWORDS, NULL},
-    {"argmax", (PyCFunction)array_argmax,
-         METH_VARARGS | METH_KEYWORDS, NULL},
-    {"argmin", (PyCFunction)array_argmin,
-         METH_VARARGS | METH_KEYWORDS, NULL},
-    {"argsort", (PyCFunction)array_argsort,
-         METH_VARARGS | METH_KEYWORDS, NULL},
-    {"astype", (PyCFunction)array_cast,
-         METH_VARARGS, NULL},
-    {"byteswap", (PyCFunction)array_byteswap,
-         METH_VARARGS, NULL},
-    {"choose", (PyCFunction)array_choose,
-         METH_VARARGS | METH_KEYWORDS, NULL},
-    {"clip", (PyCFunction)array_clip,
-         METH_VARARGS | METH_KEYWORDS, NULL},
-    {"compress", (PyCFunction)array_compress,
-         METH_VARARGS | METH_KEYWORDS, NULL},
-    {"conj", (PyCFunction)array_conjugate,
-         METH_VARARGS, NULL},
-    {"conjugate", (PyCFunction)array_conjugate,
-         METH_VARARGS, NULL},
-    {"copy", (PyCFunction)array_copy,
-         METH_VARARGS, NULL},
-    {"cumprod", (PyCFunction)array_cumprod,
-         METH_VARARGS | METH_KEYWORDS, NULL},
-    {"cumsum", (PyCFunction)array_cumsum,
-         METH_VARARGS | METH_KEYWORDS, NULL},
-    {"diagonal", (PyCFunction)array_diagonal,
-         METH_VARARGS | METH_KEYWORDS, NULL},
-    {"fill", (PyCFunction)array_fill,
-         METH_VARARGS, NULL},
-    {"flatten", (PyCFunction)array_flatten,
-         METH_VARARGS, NULL},
-    {"getfield", (PyCFunction)array_getfield,
-         METH_VARARGS | METH_KEYWORDS, NULL},
-    {"item", (PyCFunction)array_toscalar,
-         METH_VARARGS, NULL},
-    {"itemset", (PyCFunction) array_setscalar,
-         METH_VARARGS, NULL},
-    {"max", (PyCFunction)array_max,
-         METH_VARARGS | METH_KEYWORDS, NULL},
-    {"mean", (PyCFunction)array_mean,
-         METH_VARARGS | METH_KEYWORDS, NULL},
-    {"min", (PyCFunction)array_min,
-         METH_VARARGS | METH_KEYWORDS, NULL},
-    {"newbyteorder", (PyCFunction)array_newbyteorder,
-         METH_VARARGS, NULL},
-    {"nonzero", (PyCFunction)array_nonzero,
-         METH_VARARGS, NULL},
-    {"prod", (PyCFunction)array_prod,
-         METH_VARARGS | METH_KEYWORDS, NULL},
-    {"ptp", (PyCFunction)array_ptp,
-         METH_VARARGS | METH_KEYWORDS, NULL},
-    {"put", (PyCFunction)array_put,
-         METH_VARARGS | METH_KEYWORDS, NULL},
-    {"ravel", (PyCFunction)array_ravel,
-         METH_VARARGS, NULL},
-    {"repeat", (PyCFunction)array_repeat,
-         METH_VARARGS | METH_KEYWORDS, NULL},
-    {"reshape", (PyCFunction)array_reshape,
-         METH_VARARGS | METH_KEYWORDS, NULL},
-    {"resize", (PyCFunction)array_resize,
-         METH_VARARGS | METH_KEYWORDS, NULL},
-    {"round", (PyCFunction)array_round,
-         METH_VARARGS | METH_KEYWORDS, NULL},
-    {"searchsorted", (PyCFunction)array_searchsorted,
-         METH_VARARGS | METH_KEYWORDS, NULL},
-    {"setfield", (PyCFunction)array_setfield,
-         METH_VARARGS | METH_KEYWORDS, NULL},
-    {"setflags", (PyCFunction)array_setflags,
-         METH_VARARGS | METH_KEYWORDS, NULL},
-    {"sort", (PyCFunction)array_sort,
-         METH_VARARGS | METH_KEYWORDS, NULL},
-    {"squeeze", (PyCFunction)array_squeeze,
-         METH_VARARGS, NULL},
-    {"std", (PyCFunction)array_stddev,
-         METH_VARARGS | METH_KEYWORDS, NULL},
-    {"sum", (PyCFunction)array_sum,
-         METH_VARARGS | METH_KEYWORDS, NULL},
-    {"swapaxes", (PyCFunction)array_swapaxes,
-         METH_VARARGS, NULL},
-    {"take", (PyCFunction)array_take,
-         METH_VARARGS | METH_KEYWORDS, NULL},
-    {"tofile", (PyCFunction)array_tofile,
-         METH_VARARGS | METH_KEYWORDS, NULL},
-    {"tolist", (PyCFunction)array_tolist,
-         METH_VARARGS, NULL},
-    {"tostring", (PyCFunction)array_tostring,
-         METH_VARARGS | METH_KEYWORDS, NULL},
-    {"trace", (PyCFunction)array_trace,
-         METH_VARARGS | METH_KEYWORDS, NULL},
-    {"transpose", (PyCFunction)array_transpose,
-         METH_VARARGS, NULL},
-    {"var", (PyCFunction)array_variance,
-         METH_VARARGS | METH_KEYWORDS, NULL},
-    {"view", (PyCFunction)array_view,
-         METH_VARARGS | METH_KEYWORDS, NULL},
+    {"all",
+        (PyCFunction)array_all,
+        METH_VARARGS | METH_KEYWORDS, NULL},
+    {"any",
+        (PyCFunction)array_any,
+        METH_VARARGS | METH_KEYWORDS, NULL},
+    {"argmax",
+        (PyCFunction)array_argmax,
+        METH_VARARGS | METH_KEYWORDS, NULL},
+    {"argmin",
+        (PyCFunction)array_argmin,
+        METH_VARARGS | METH_KEYWORDS, NULL},
+    {"argsort",
+        (PyCFunction)array_argsort,
+        METH_VARARGS | METH_KEYWORDS, NULL},
+    {"astype",
+        (PyCFunction)array_cast,
+        METH_VARARGS, NULL},
+    {"byteswap",
+        (PyCFunction)array_byteswap,
+        METH_VARARGS, NULL},
+    {"choose",
+        (PyCFunction)array_choose,
+        METH_VARARGS | METH_KEYWORDS, NULL},
+    {"clip",
+        (PyCFunction)array_clip,
+        METH_VARARGS | METH_KEYWORDS, NULL},
+    {"compress",
+        (PyCFunction)array_compress,
+        METH_VARARGS | METH_KEYWORDS, NULL},
+    {"conj",
+        (PyCFunction)array_conjugate,
+        METH_VARARGS, NULL},
+    {"conjugate",
+        (PyCFunction)array_conjugate,
+        METH_VARARGS, NULL},
+    {"copy",
+        (PyCFunction)array_copy,
+        METH_VARARGS, NULL},
+    {"cumprod",
+        (PyCFunction)array_cumprod,
+        METH_VARARGS | METH_KEYWORDS, NULL},
+    {"cumsum",
+        (PyCFunction)array_cumsum,
+        METH_VARARGS | METH_KEYWORDS, NULL},
+    {"diagonal",
+        (PyCFunction)array_diagonal,
+        METH_VARARGS | METH_KEYWORDS, NULL},
+    {"fill",
+        (PyCFunction)array_fill,
+        METH_VARARGS, NULL},
+    {"flatten",
+        (PyCFunction)array_flatten,
+        METH_VARARGS, NULL},
+    {"getfield",
+        (PyCFunction)array_getfield,
+        METH_VARARGS | METH_KEYWORDS, NULL},
+    {"item",
+        (PyCFunction)array_toscalar,
+        METH_VARARGS, NULL},
+    {"itemset",
+        (PyCFunction) array_setscalar,
+        METH_VARARGS, NULL},
+    {"max",
+        (PyCFunction)array_max,
+        METH_VARARGS | METH_KEYWORDS, NULL},
+    {"mean",
+        (PyCFunction)array_mean,
+        METH_VARARGS | METH_KEYWORDS, NULL},
+    {"min",
+        (PyCFunction)array_min,
+        METH_VARARGS | METH_KEYWORDS, NULL},
+    {"newbyteorder",
+        (PyCFunction)array_newbyteorder,
+        METH_VARARGS, NULL},
+    {"nonzero",
+        (PyCFunction)array_nonzero,
+        METH_VARARGS, NULL},
+    {"prod",
+        (PyCFunction)array_prod,
+        METH_VARARGS | METH_KEYWORDS, NULL},
+    {"ptp",
+        (PyCFunction)array_ptp,
+        METH_VARARGS | METH_KEYWORDS, NULL},
+    {"put",
+        (PyCFunction)array_put,
+        METH_VARARGS | METH_KEYWORDS, NULL},
+    {"ravel",
+        (PyCFunction)array_ravel,
+        METH_VARARGS, NULL},
+    {"repeat",
+        (PyCFunction)array_repeat,
+        METH_VARARGS | METH_KEYWORDS, NULL},
+    {"reshape",
+        (PyCFunction)array_reshape,
+        METH_VARARGS | METH_KEYWORDS, NULL},
+    {"resize",
+        (PyCFunction)array_resize,
+        METH_VARARGS | METH_KEYWORDS, NULL},
+    {"round",
+        (PyCFunction)array_round,
+        METH_VARARGS | METH_KEYWORDS, NULL},
+    {"searchsorted",
+        (PyCFunction)array_searchsorted,
+        METH_VARARGS | METH_KEYWORDS, NULL},
+    {"setfield",
+        (PyCFunction)array_setfield,
+        METH_VARARGS | METH_KEYWORDS, NULL},
+    {"setflags",
+        (PyCFunction)array_setflags,
+        METH_VARARGS | METH_KEYWORDS, NULL},
+    {"sort",
+        (PyCFunction)array_sort,
+        METH_VARARGS | METH_KEYWORDS, NULL},
+    {"squeeze",
+        (PyCFunction)array_squeeze,
+        METH_VARARGS, NULL},
+    {"std",
+        (PyCFunction)array_stddev,
+        METH_VARARGS | METH_KEYWORDS, NULL},
+    {"sum",
+        (PyCFunction)array_sum,
+        METH_VARARGS | METH_KEYWORDS, NULL},
+    {"swapaxes",
+        (PyCFunction)array_swapaxes,
+        METH_VARARGS, NULL},
+    {"take",
+        (PyCFunction)array_take,
+        METH_VARARGS | METH_KEYWORDS, NULL},
+    {"tofile",
+        (PyCFunction)array_tofile,
+        METH_VARARGS | METH_KEYWORDS, NULL},
+    {"tolist",
+        (PyCFunction)array_tolist,
+        METH_VARARGS, NULL},
+    {"tostring",
+        (PyCFunction)array_tostring,
+        METH_VARARGS | METH_KEYWORDS, NULL},
+    {"trace",
+        (PyCFunction)array_trace,
+        METH_VARARGS | METH_KEYWORDS, NULL},
+    {"transpose",
+        (PyCFunction)array_transpose,
+        METH_VARARGS, NULL},
+    {"var",
+        (PyCFunction)array_variance,
+        METH_VARARGS | METH_KEYWORDS, NULL},
+    {"view",
+        (PyCFunction)array_view,
+        METH_VARARGS | METH_KEYWORDS, NULL},
     {NULL, NULL, 0, NULL}           /* sentinel */
 };
 
diff --git a/numpy/core/src/multiarray/multiarray_tests.c.src b/numpy/core/src/multiarray/multiarray_tests.c.src
index 796b12d4f..92b149961 100644
--- a/numpy/core/src/multiarray/multiarray_tests.c.src
+++ b/numpy/core/src/multiarray/multiarray_tests.c.src
@@ -370,8 +370,12 @@ clean_ax:
 }
 
 static PyMethodDef Multiarray_TestsMethods[] = {
-    {"test_neighborhood_iterator",  test_neighborhood_iterator, METH_VARARGS, NULL},
-    {"test_neighborhood_iterator_oob",  test_neighborhood_iterator_oob, METH_VARARGS, NULL},
+    {"test_neighborhood_iterator",
+        test_neighborhood_iterator,
+        METH_VARARGS, NULL},
+    {"test_neighborhood_iterator_oob",
+        test_neighborhood_iterator_oob,
+        METH_VARARGS, NULL},
     {NULL, NULL, 0, NULL}        /* Sentinel */
 };
 
diff --git a/numpy/core/src/multiarray/multiarraymodule.c b/numpy/core/src/multiarray/multiarraymodule.c
index 591e49108..147b0bcfa 100644
--- a/numpy/core/src/multiarray/multiarraymodule.c
+++ b/numpy/core/src/multiarray/multiarraymodule.c
@@ -1332,29 +1332,29 @@ _equivalent_fields(PyObject *field1, PyObject *field2) {
 
 /*
  * compare the metadata for two date-times
- * return 1 if they are the same 
+ * return 1 if they are the same
  * or 0 if not
  */
 static int
-_equivalent_units(PyObject *meta1, PyObject *meta2) 
+_equivalent_units(PyObject *meta1, PyObject *meta2)
 {
     PyObject *cobj1, *cobj2;
     PyArray_DatetimeMetaData *data1, *data2;
-    
+
     /* Same meta object */
     if (meta1 == meta2)
 	return 1;
-    
+
     cobj1 = PyDict_GetItemString(meta1, NPY_METADATA_DTSTR);
     cobj2 = PyDict_GetItemString(meta2, NPY_METADATA_DTSTR);
-    if (cobj1 == cobj2) 
+    if (cobj1 == cobj2)
 	return 1;
-    
+
     data1 = PyCObject_AsVoidPtr(cobj1);
     data2 = PyCObject_AsVoidPtr(cobj2);
-    
-    return ((data1->base == data2->base) && (data1->num == data2->num) 
-	    && (data1->den == data2->den) && (data1->events == data2->events));    
+
+    return ((data1->base == data2->base) && (data1->num == data2->num)
+	    && (data1->den == data2->den) && (data1->events == data2->events));
 }