diff options
| author | Emilien Kofman <emilien.kofman@gmail.com> | 2016-03-16 11:02:55 +0100 |
|---|---|---|
| committer | Eric Wieser <wieser.eric@gmail.com> | 2017-09-13 20:25:52 -0700 |
| commit | 98d15b4c066b6fbccdce3d97130a563374b1c9ba (patch) | |
| tree | 466a4edd4a3e6a793ee2bf6dcd6111d2a9d53fee /numpy | |
| parent | f7be36b05feff7f54b3e118a9af265d0b9de94e2 (diff) | |
| download | numpy-98d15b4c066b6fbccdce3d97130a563374b1c9ba.tar.gz | |
BUG: Fixes #7395, operator.index now fails on numpy.bool_
Diffstat (limited to 'numpy')
| -rw-r--r-- | numpy/core/src/multiarray/scalartypes.c.src | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/numpy/core/src/multiarray/scalartypes.c.src b/numpy/core/src/multiarray/scalartypes.c.src index 7a6ed6a86..1c809f409 100644 --- a/numpy/core/src/multiarray/scalartypes.c.src +++ b/numpy/core/src/multiarray/scalartypes.c.src @@ -2843,7 +2843,9 @@ static PyNumberMethods @name@_arrtype_as_number; static PyObject * bool_index(PyObject *a) { - return PyInt_FromLong(PyArrayScalar_VAL(a, Bool)); + PyErr_SetString(PyExc_TypeError, + "A boolean scalar cannot be converted to an index"); + return NULL; } /* Arithmetic methods -- only so we can override &, |, ^. */ |