diff options
| author | Han Genuit <hangenuit@gmail.com> | 2012-09-04 00:29:46 +0200 |
|---|---|---|
| committer | Sebastian Berg <sebastian@sipsolutions.net> | 2013-04-11 16:58:57 +0200 |
| commit | fc52c2887d854bce389cc5185704b35a509aae07 (patch) | |
| tree | 938036a2088cc9fa6630d1af2f8064c5c15de43b | |
| parent | e3f01df89db94886c75718f1ead7c084f9e71905 (diff) | |
| download | numpy-fc52c2887d854bce389cc5185704b35a509aae07.tar.gz | |
BUG: Fix old case for boolean subscripts with non-matching shape.
Conflicts:
numpy/core/src/multiarray/mapping.c
| -rw-r--r-- | numpy/core/src/multiarray/mapping.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/numpy/core/src/multiarray/mapping.c b/numpy/core/src/multiarray/mapping.c index 207bd212b..88ba84f70 100644 --- a/numpy/core/src/multiarray/mapping.c +++ b/numpy/core/src/multiarray/mapping.c @@ -1222,7 +1222,7 @@ array_subscript(PyArrayObject *self, PyObject *op) } /* Boolean indexing special case */ - /* The SIZE check might be overly cautious */ + /* The SIZE check is to ensure old behaviour for non-matching arrays. */ else if (PyArray_ISBOOL((PyArrayObject *)op) && (PyArray_NDIM(self) == PyArray_NDIM((PyArrayObject *)op)) && (PyArray_SIZE((PyArrayObject *)op) == PyArray_SIZE(self))) { |