diff options
| author | Travis Oliphant <oliphant@enthought.com> | 2006-12-02 04:11:31 +0000 |
|---|---|---|
| committer | Travis Oliphant <oliphant@enthought.com> | 2006-12-02 04:11:31 +0000 |
| commit | bf677ca3b1b02c57da75a302a0f0b5704e3f525f (patch) | |
| tree | 06947d88317a5c3787ce13bd4b6250b2341e19ca /numpy/core/src/arraymethods.c | |
| parent | 574fe369112ded91f80502db73022a8fd79d3fe3 (diff) | |
| download | numpy-bf677ca3b1b02c57da75a302a0f0b5704e3f525f.tar.gz | |
Allow argsort and sort functions and argsort method to take None as an argument. Add order= keyword to sort and argsort functions.
Diffstat (limited to 'numpy/core/src/arraymethods.c')
| -rw-r--r-- | numpy/core/src/arraymethods.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/numpy/core/src/arraymethods.c b/numpy/core/src/arraymethods.c index d33fbc70e..fcde13fae 100644 --- a/numpy/core/src/arraymethods.c +++ b/numpy/core/src/arraymethods.c @@ -898,7 +898,8 @@ array_argsort(PyArrayObject *self, PyObject *args, PyObject *kwds) PyArray_Descr *newd, *saved=NULL; static char *kwlist[] = {"axis", "kind", "order", NULL}; - if (!PyArg_ParseTupleAndKeywords(args, kwds, "|iO&O", kwlist, &axis, + if (!PyArg_ParseTupleAndKeywords(args, kwds, "|O&O&O", kwlist, + PyArray_AxisConverter, &axis, PyArray_SortkindConverter, &which, &order)) return NULL; |