summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorToshiki Kataoka <kataoka@preferred.jp>2018-06-20 14:05:53 +0900
committerToshiki Kataoka <kataoka@preferred.jp>2018-06-20 14:05:53 +0900
commit0cecc277ace6397c1adcb0111e368482b0c0e0d4 (patch)
treefdbb7dc70748b93648de5633350acbf8301d3d13
parentebedea271a5bb0f7a3251c6d390fd14652912118 (diff)
downloadnumpy-0cecc277ace6397c1adcb0111e368482b0c0e0d4.tar.gz
Make scalar.squeeze accept axis arg
-rw-r--r--numpy/core/src/multiarray/scalartypes.c.src14
1 files changed, 2 insertions, 12 deletions
diff --git a/numpy/core/src/multiarray/scalartypes.c.src b/numpy/core/src/multiarray/scalartypes.c.src
index 25e0668ed..a32aa47ab 100644
--- a/numpy/core/src/multiarray/scalartypes.c.src
+++ b/numpy/core/src/multiarray/scalartypes.c.src
@@ -1675,16 +1675,6 @@ gentype_itemset(PyObject *NPY_UNUSED(self), PyObject *NPY_UNUSED(args))
return NULL;
}
-static PyObject *
-gentype_squeeze(PyObject *self, PyObject *args)
-{
- if (!PyArg_ParseTuple(args, "")) {
- return NULL;
- }
- Py_INCREF(self);
- return self;
-}
-
static Py_ssize_t
gentype_getreadbuf(PyObject *, Py_ssize_t, void **);
@@ -1738,7 +1728,7 @@ gentype_byteswap(PyObject *self, PyObject *args, PyObject *kwds)
* std, var, sum, cumsum, prod, cumprod, compress, sort, argsort,
* round, argmax, argmin, max, min, ptp, any, all, astype, resize,
* reshape, choose, tostring, tobytes, copy, searchsorted, view,
- * flatten, ravel#
+ * flatten, ravel, squeeze#
*/
static PyObject *
gentype_@name@(PyObject *self, PyObject *args, PyObject *kwds)
@@ -2121,7 +2111,7 @@ static PyMethodDef gentype_methods[] = {
METH_VARARGS | METH_KEYWORDS, NULL},
{"squeeze",
(PyCFunction)gentype_squeeze,
- METH_VARARGS, NULL},
+ METH_VARARGS | METH_KEYWORDS, NULL},
{"view",
(PyCFunction)gentype_view,
METH_VARARGS | METH_KEYWORDS, NULL},