diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2016-01-03 19:17:46 -0700 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2016-01-03 19:17:46 -0700 |
| commit | e072d79f03610c33e336a9b700882d8905f9c958 (patch) | |
| tree | 64fef7848031e4ed460eb0e9a453af198523e3b8 /numpy | |
| parent | c2ed0e0737431e95905d70cd49f6c54a32d0e90c (diff) | |
| parent | 277eabe390c6f67962a48764df3d77443776b3cc (diff) | |
| download | numpy-e072d79f03610c33e336a9b700882d8905f9c958.tar.gz | |
Merge pull request #6900 from kohr-h/master
ENH: clarify error message of broadcast
Diffstat (limited to 'numpy')
| -rw-r--r-- | numpy/core/src/multiarray/iterators.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/numpy/core/src/multiarray/iterators.c b/numpy/core/src/multiarray/iterators.c index 829994b1e..702f9e21a 100644 --- a/numpy/core/src/multiarray/iterators.c +++ b/numpy/core/src/multiarray/iterators.c @@ -1458,8 +1458,8 @@ PyArray_MultiIterFromObjects(PyObject **mps, int n, int nadd, ...) ntot = n + nadd; if (ntot < 2 || ntot > NPY_MAXARGS) { PyErr_Format(PyExc_ValueError, - "Need between 2 and (%d) " \ - "array objects (inclusive).", NPY_MAXARGS); + "Need at least 2 and at most %d " + "array objects.", NPY_MAXARGS); return NULL; } multi = PyArray_malloc(sizeof(PyArrayMultiIterObject)); @@ -1524,8 +1524,8 @@ PyArray_MultiIterNew(int n, ...) if (n < 2 || n > NPY_MAXARGS) { PyErr_Format(PyExc_ValueError, - "Need between 2 and (%d) " \ - "array objects (inclusive).", NPY_MAXARGS); + "Need at least 2 and at most %d " + "array objects.", NPY_MAXARGS); return NULL; } @@ -1608,7 +1608,7 @@ arraymultiter_new(PyTypeObject *NPY_UNUSED(subtype), PyObject *args, PyObject *k return NULL; } PyErr_Format(PyExc_ValueError, - "Need at least two and fewer than (%d) " + "Need at least 2 and at most %d " "array objects.", NPY_MAXARGS); return NULL; } |