diff options
| author | Ross Barnowski <rossbar@berkeley.edu> | 2022-09-12 15:22:21 -0700 |
|---|---|---|
| committer | Ross Barnowski <rossbar@berkeley.edu> | 2022-09-12 15:22:21 -0700 |
| commit | cca7f77299b0b158c4064a6448b56f75f81b16e8 (patch) | |
| tree | b8f62652a39e43ff88b4d0be37aaa9744d03ebe5 | |
| parent | 71155e9331cd30dbb37732a74fca5f23ab734aa4 (diff) | |
| download | numpy-cca7f77299b0b158c4064a6448b56f75f81b16e8.tar.gz | |
DOC: Update concatenate exception message.
Add missing word to correct exception message when concatenate
axes don't match.
| -rw-r--r-- | numpy/core/src/multiarray/multiarraymodule.c | 2 | ||||
| -rw-r--r-- | numpy/core/tests/test_shape_base.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/numpy/core/src/multiarray/multiarraymodule.c b/numpy/core/src/multiarray/multiarraymodule.c index f8e7d37c3..618119443 100644 --- a/numpy/core/src/multiarray/multiarraymodule.c +++ b/numpy/core/src/multiarray/multiarraymodule.c @@ -436,7 +436,7 @@ PyArray_ConcatenateArrays(int narrays, PyArrayObject **arrays, int axis, /* Validate that the rest of the dimensions match */ else if (shape[idim] != arr_shape[idim]) { PyErr_Format(PyExc_ValueError, - "all the input array dimensions for the " + "all the input array dimensions except for the " "concatenation axis must match exactly, but " "along dimension %d, the array at index %d has " "size %d and the array at index %d has size %d", diff --git a/numpy/core/tests/test_shape_base.py b/numpy/core/tests/test_shape_base.py index c8dbb144a..570d006f5 100644 --- a/numpy/core/tests/test_shape_base.py +++ b/numpy/core/tests/test_shape_base.py @@ -260,7 +260,7 @@ class TestConcatenate: np.concatenate((a, b), axis=axis[0]) # OK assert_raises_regex( ValueError, - "all the input array dimensions for the concatenation axis " + "all the input array dimensions except for the concatenation axis " "must match exactly, but along dimension {}, the array at " "index 0 has size 1 and the array at index 1 has size 2" .format(i), |