Skip to content

BUG: Fixes #7395, operator.index now fails on numpy.bool_ #9685

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
charris merged 4 commits into from
Oct 21, 2017
Merged

BUG: Fixes #7395, operator.index now fails on numpy.bool_ #9685

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
98d15b4
BUG: Fixes #7395, operator.index now fails on numpy.bool_
emilienkofman Mar 16, 2016
448ac03
TST: Add test for operator.index(np.bool_)
eric-wieser Sep 14, 2017
04b14d6
DEP: Warn when using bool.__index__, rather than removing it completely
eric-wieser Sep 18, 2017
a95c552
Merge branch 'master' into bool-__index__
charris Oct 21, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
BUG: Fixes #7395, operator.index now fails on numpy.bool_
  • Loading branch information
@emilienkofman @eric-wieser
emilienkofman authored and eric-wieser committed Sep 14, 2017
commit 98d15b4c066b6fbccdce3d97130a563374b1c9ba
4 changes: 3 additions & 1 deletion numpy/core/src/multiarray/scalartypes.c.src
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,

@mhvk mhvk Sep 14, 2017

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Instead of raising an error here, isn't it easier to remove this whole definition and not define (or explicitly set to NULL; not sure) PyBoolArrType_Type.tp_as_number->nb_index? (it is currently defined in L4114).

@eric-wieser eric-wieser Sep 15, 2017

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, good catch

"A boolean scalar cannot be converted to an index");
return NULL;
}

/* Arithmetic methods -- only so we can override &, |, ^. */
Expand Down