diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2006-09-21 15:51:00 +0000 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2006-09-21 15:51:00 +0000 |
| commit | b07ee45ae38c2102dbd373894fe5389348058870 (patch) | |
| tree | a0c79ebfcd5276acb76ef4cf840bb2c61df2c135 | |
| parent | d0b67d883c3eed3ed45721b35910935c36cbeabf (diff) | |
| download | numpy-b07ee45ae38c2102dbd373894fe5389348058870.tar.gz | |
Small changes of searchsorted error messages.
| -rw-r--r-- | numpy/core/src/arraymethods.c | 5 | ||||
| -rw-r--r-- | numpy/core/src/multiarraymodule.c | 11 |
2 files changed, 8 insertions, 8 deletions
diff --git a/numpy/core/src/arraymethods.c b/numpy/core/src/arraymethods.c index 9733ae75f..f2ba3dd87 100644 --- a/numpy/core/src/arraymethods.c +++ b/numpy/core/src/arraymethods.c @@ -886,11 +886,12 @@ array_argsort(PyArrayObject *self, PyObject *args, PyObject *kwds) static PyObject * array_searchsorted(PyArrayObject *self, PyObject *args, PyObject *kwds) { - PyObject *keys; static char *kwlist[] = {"keys", "side", NULL}; + PyObject *keys; NPY_SEARCHSIDE side = NPY_SEARCHLEFT; - if (!PyArg_ParseTupleAndKeywords(args, kwds, "O|O&", kwlist, &keys, + if (!PyArg_ParseTupleAndKeywords(args, kwds, "O|O&:searchsorted", + kwlist, &keys, PyArray_SearchsideConverter, &side)) return NULL; diff --git a/numpy/core/src/multiarraymodule.c b/numpy/core/src/multiarraymodule.c index 1a3029bd9..f34996986 100644 --- a/numpy/core/src/multiarraymodule.c +++ b/numpy/core/src/multiarraymodule.c @@ -2609,15 +2609,14 @@ local_search_right(PyArrayObject *arr, PyArrayObject *key, PyArrayObject *ret) Convert object to searchsorted side */ static int -PyArray_SearchsideConverter(PyObject *obj, NPY_SEARCHSIDE *side) +PyArray_SearchsideConverter(PyObject *obj, void *addr) { + NPY_SEARCHSIDE *side = (NPY_SEARCHSIDE *)addr; char *str = PyString_AsString(obj); - if (!str) - return PY_FAIL; - if (strlen(str) < 1) { + if (!str || strlen(str) < 1) { PyErr_SetString(PyExc_ValueError, - "side must be nonempty string"); + "expected nonempty string for keyword 'side'"); return PY_FAIL; } @@ -2627,7 +2626,7 @@ PyArray_SearchsideConverter(PyObject *obj, NPY_SEARCHSIDE *side) *side = NPY_SEARCHRIGHT; else { PyErr_Format(PyExc_ValueError, - "side has invalid value '%s'", str); + "'%s' is an invalid value for keyword 'side'", str); return PY_FAIL; } return PY_SUCCEED; |