STY,DOC: Use macro METH_VARARGS everywhere. Break some lines for easy…

… reading. Add some notes.
JianMeng · Dec 19, 2009 · 043d56b · 043d56b
1 parent f8f753b
commit 043d56b
Showing 1 changed file with 69 additions and 45 deletions.
diff --git a/numpy/core/src/multiarray/scalartypes.c.src b/numpy/core/src/multiarray/scalartypes.c.src
@@ -1127,7 +1127,10 @@ gentype_wraparray(PyObject *NPY_UNUSED(scalar), PyObject *args)
     return PyArray_Scalar(PyArray_DATA(arr), PyArray_DESCR(arr), arr);
 }
 
-
+/*
+ * These gentype_* functions do not take keyword arguments.
+ * The proper flag is METH_VARARGS.
+ */
 /**begin repeat
  *
  * #name = tolist, item, tostring, astype, copy, __deepcopy__, searchsorted,
@@ -1200,6 +1203,10 @@ gentype_byteswap(PyObject *self, PyObject *args)
 }
 
 
+/*
+ * These gentype_* functions take keyword arguments.
+ * The proper flag is METH_VARARGS | METH_KEYWORDS.
+ */
 /**begin repeat
  *
  * #name = take, getfield, put, repeat, tofile, mean, trace, diagonal, clip,
@@ -1436,50 +1443,67 @@ gentype_setflags(PyObject *NPY_UNUSED(self), PyObject *NPY_UNUSED(args),
 */
 static PyMethodDef gentype_methods[] = {
     {"tolist",
-        (PyCFunction)gentype_tolist,   1, NULL},
+        (PyCFunction)gentype_tolist,
+        METH_VARARGS, NULL},
     {"item",
-        (PyCFunction)gentype_item, METH_VARARGS, NULL},
+        (PyCFunction)gentype_item,
+        METH_VARARGS, NULL},
     {"itemset",
-        (PyCFunction)gentype_itemset, METH_VARARGS, NULL},
-    {"tofile", (PyCFunction)gentype_tofile,
-        METH_VARARGS|METH_KEYWORDS, NULL},
+        (PyCFunction)gentype_itemset,
+        METH_VARARGS, NULL},
+    {"tofile",
+        (PyCFunction)gentype_tofile,
+        METH_VARARGS | METH_KEYWORDS, NULL},
     {"tostring",
-        (PyCFunction)gentype_tostring, METH_VARARGS, NULL},
+        (PyCFunction)gentype_tostring,
+        METH_VARARGS, NULL},
     {"byteswap",
-        (PyCFunction)gentype_byteswap,1, NULL},
+        (PyCFunction)gentype_byteswap,
+        METH_VARARGS, NULL},
     {"astype",
-        (PyCFunction)gentype_astype, 1, NULL},
+        (PyCFunction)gentype_astype,
+        METH_VARARGS, NULL},
     {"getfield",
         (PyCFunction)gentype_getfield,
         METH_VARARGS | METH_KEYWORDS, NULL},
     {"setfield",
         (PyCFunction)gentype_setfield,
         METH_VARARGS | METH_KEYWORDS, NULL},
     {"copy",
-        (PyCFunction)gentype_copy, 1, NULL},
-    {"resize", (PyCFunction)gentype_resize,
-        METH_VARARGS|METH_KEYWORDS, NULL},
+        (PyCFunction)gentype_copy,
+        METH_VARARGS, NULL},
+    {"resize",
+        (PyCFunction)gentype_resize,
+        METH_VARARGS | METH_KEYWORDS, NULL},
     {"__array__",
-        (PyCFunction)gentype_getarray, 1, doc_getarray},
+        (PyCFunction)gentype_getarray,
+        METH_VARARGS, doc_getarray},
     {"__array_wrap__",
-        (PyCFunction)gentype_wraparray, 1, doc_sc_wraparray},
+        (PyCFunction)gentype_wraparray,
+        METH_VARARGS, doc_sc_wraparray},
 
     /* for the copy module */
     {"__copy__",
-        (PyCFunction)gentype_copy, 1, NULL},
+        (PyCFunction)gentype_copy,
+        METH_VARARGS, NULL},
     {"__deepcopy__",
-        (PyCFunction)gentype___deepcopy__, 1, NULL},
+        (PyCFunction)gentype___deepcopy__,
+        METH_VARARGS, NULL},
 
     {"__reduce__",
-        (PyCFunction) gentype_reduce, 1, NULL},
+        (PyCFunction) gentype_reduce,
+        METH_VARARGS, NULL},
     /* For consistency does nothing */
     {"__setstate__",
-        (PyCFunction) gentype_setstate, 1, NULL},
+        (PyCFunction) gentype_setstate,
+        METH_VARARGS, NULL},
 
     {"dumps",
-        (PyCFunction) gentype_dumps, 1, NULL},
+        (PyCFunction) gentype_dumps,
+        METH_VARARGS, NULL},
     {"dump",
-        (PyCFunction) gentype_dump, 1, NULL},
+        (PyCFunction) gentype_dump,
+        METH_VARARGS, NULL},
 
     /* Methods for array */
     {"fill",
@@ -1490,16 +1514,16 @@ static PyMethodDef gentype_methods[] = {
         METH_VARARGS, NULL},
     {"take",
         (PyCFunction)gentype_take,
-        METH_VARARGS|METH_KEYWORDS, NULL},
+        METH_VARARGS | METH_KEYWORDS, NULL},
     {"put",
         (PyCFunction)gentype_put,
-        METH_VARARGS|METH_KEYWORDS, NULL},
+        METH_VARARGS | METH_KEYWORDS, NULL},
     {"repeat",
         (PyCFunction)gentype_repeat,
-        METH_VARARGS|METH_KEYWORDS, NULL},
+        METH_VARARGS | METH_KEYWORDS, NULL},
     {"choose",
         (PyCFunction)gentype_choose,
-        METH_VARARGS|METH_KEYWORDS, NULL},
+        METH_VARARGS | METH_KEYWORDS, NULL},
     {"sort",
         (PyCFunction)gentype_sort,
         METH_VARARGS, NULL},
@@ -1511,13 +1535,13 @@ static PyMethodDef gentype_methods[] = {
         METH_VARARGS, NULL},
     {"argmax",
         (PyCFunction)gentype_argmax,
-        METH_VARARGS|METH_KEYWORDS, NULL},
+        METH_VARARGS | METH_KEYWORDS, NULL},
     {"argmin",
         (PyCFunction)gentype_argmin,
-        METH_VARARGS|METH_KEYWORDS, NULL},
+        METH_VARARGS | METH_KEYWORDS, NULL},
     {"reshape",
         (PyCFunction)gentype_reshape,
-        METH_VARARGS|METH_KEYWORDS, NULL},
+        METH_VARARGS | METH_KEYWORDS, NULL},
     {"squeeze",
         (PyCFunction)gentype_squeeze,
         METH_VARARGS, NULL},
@@ -1529,25 +1553,25 @@ static PyMethodDef gentype_methods[] = {
         METH_VARARGS, NULL},
     {"max",
         (PyCFunction)gentype_max,
-        METH_VARARGS|METH_KEYWORDS, NULL},
+        METH_VARARGS | METH_KEYWORDS, NULL},
     {"min",
         (PyCFunction)gentype_min,
-        METH_VARARGS|METH_KEYWORDS, NULL},
+        METH_VARARGS | METH_KEYWORDS, NULL},
     {"ptp",
         (PyCFunction)gentype_ptp,
-        METH_VARARGS|METH_KEYWORDS, NULL},
+        METH_VARARGS | METH_KEYWORDS, NULL},
     {"mean",
         (PyCFunction)gentype_mean,
-        METH_VARARGS|METH_KEYWORDS, NULL},
+        METH_VARARGS | METH_KEYWORDS, NULL},
     {"trace",
         (PyCFunction)gentype_trace,
-        METH_VARARGS|METH_KEYWORDS, NULL},
+        METH_VARARGS | METH_KEYWORDS, NULL},
     {"diagonal",
         (PyCFunction)gentype_diagonal,
-        METH_VARARGS|METH_KEYWORDS, NULL},
+        METH_VARARGS | METH_KEYWORDS, NULL},
     {"clip",
         (PyCFunction)gentype_clip,
-        METH_VARARGS|METH_KEYWORDS, NULL},
+        METH_VARARGS | METH_KEYWORDS, NULL},
     {"conj",
         (PyCFunction)gentype_conj,
         METH_VARARGS, NULL},
@@ -1559,31 +1583,31 @@ static PyMethodDef gentype_methods[] = {
         METH_VARARGS, NULL},
     {"std",
         (PyCFunction)gentype_std,
-        METH_VARARGS|METH_KEYWORDS, NULL},
+        METH_VARARGS | METH_KEYWORDS, NULL},
     {"var",
         (PyCFunction)gentype_var,
-        METH_VARARGS|METH_KEYWORDS, NULL},
+        METH_VARARGS | METH_KEYWORDS, NULL},
     {"sum",
         (PyCFunction)gentype_sum,
-        METH_VARARGS|METH_KEYWORDS, NULL},
+        METH_VARARGS | METH_KEYWORDS, NULL},
     {"cumsum",
         (PyCFunction)gentype_cumsum,
-        METH_VARARGS|METH_KEYWORDS, NULL},
+        METH_VARARGS | METH_KEYWORDS, NULL},
     {"prod",
         (PyCFunction)gentype_prod,
-        METH_VARARGS|METH_KEYWORDS, NULL},
+        METH_VARARGS | METH_KEYWORDS, NULL},
     {"cumprod",
         (PyCFunction)gentype_cumprod,
-        METH_VARARGS|METH_KEYWORDS, NULL},
+        METH_VARARGS | METH_KEYWORDS, NULL},
     {"all",
         (PyCFunction)gentype_all,
-        METH_VARARGS|METH_KEYWORDS, NULL},
+        METH_VARARGS | METH_KEYWORDS, NULL},
     {"any",
         (PyCFunction)gentype_any,
-        METH_VARARGS|METH_KEYWORDS, NULL},
+        METH_VARARGS | METH_KEYWORDS, NULL},
     {"compress",
         (PyCFunction)gentype_compress,
-        METH_VARARGS|METH_KEYWORDS, NULL},
+        METH_VARARGS | METH_KEYWORDS, NULL},
     {"flatten",
         (PyCFunction)gentype_flatten,
         METH_VARARGS, NULL},
@@ -1592,10 +1616,10 @@ static PyMethodDef gentype_methods[] = {
         METH_VARARGS, NULL},
     {"round",
         (PyCFunction)gentype_round,
-        METH_VARARGS|METH_KEYWORDS, NULL},
+        METH_VARARGS | METH_KEYWORDS, NULL},
     {"setflags",
         (PyCFunction)gentype_setflags,
-        METH_VARARGS|METH_KEYWORDS, NULL},
+        METH_VARARGS | METH_KEYWORDS, NULL},
     {"newbyteorder",
         (PyCFunction)gentype_newbyteorder,
         METH_VARARGS, NULL},