8000 MAINT: Make the refactor suggested in prepare_index by eric-wieser · Pull Request #8278 · numpy/numpy · GitHub
[go: up one dir, main page]
Skip to content

MAINT: Make the refactor suggested in prepare_index #8278

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
merged 11 commits into from
Jul 18, 2017
Merged

MAINT: Make the refactor suggested in prepare_index #8278

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
87e1294
MAINT: Make the refactor suggested in prepare_index
eric-wieser Nov 14, 2016
bfd70c2
MAINT: Fix typo, remove unnecessary nesting
eric-wieser Dec 5, 2016
37e6e1f
MAINT: use PyTuple_Pack, which is probably faster than Py_BuildValue
eric-wieser Dec 21, 2016
3a0ad85
MAINT: Overhaul function to try and increase speed
eric-wieser Apr 7, 2017
8c4e556
BUG: Fix reference counting
eric-wieser Apr 9, 2017
5d9315c
STY: Fix comment capitalization and format
eric-wieser Apr 9, 2017
966b2c7
fixup! BUG: Fix reference counting
eric-wieser Apr 9, 2017
9832f05
fixup! MAINT: Overhaul function to try and increase speed
eric-wieser Apr 9, 2017
68bad6a
MAINT: Improve comments, simplify handling of tuple subclasses
eric-wieser Jul 16, 2017
c587963
fixup! MAINT: Improve comments, simplify handling of tuple subclasses
eric-wieser Jul 16, 2017
105e0b4
fixup! MAINT: Improve comments, simplify handling of tuple subclasses
eric-wieser Jul 16, 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
Prev Previous commit
Next Next commit
MAINT: Fix typo, remove unnecessary nesting
  • Loading branch information
@eric-wieser
eric-wieser committed Apr 8, 2017
commit bfd70c23b57ab278566f3503d9d93f20b0512281
17 changes: 7 additions & 10 deletions numpy/core/src/multiarray/mapping.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,22 +223,19 @@ prepare_index_tuple(PyObject *index)
}
}

/* If the index is not a tuple, conver it into (index,) */
/* If the index is not a tuple, convert it into (index,) */
if (!make_tuple && !PyTuple_CheckExact(index)) {
make_tuple = 1;
index_as_tuple = Py_BuildValue("(O)", index);
}
/* Otherwise, check if the tuple is too long */
else {
n = PyTuple_GET_SIZE(index_as_tuple);
if (n > NPY_MAXDIMS * 2) {
PyErr_SetString(PyExc_IndexError,
"too many indices for array");
if (make_tuple) {
Py_DECREF(index_as_tuple);
}
return NULL;
else if (PyTuple_GET_SIZE(index_as_tuple) > NPY_MAXDIMS * 2) {
PyErr_SetString(PyExc_IndexError,
"too many indices for array");
if (make_tuple) {
Py_DECREF(index_as_tuple);
}
return NULL;
}

Copy link
Member

Choose a reason for hiding this comment

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

Just what I think right now (don't worry about it), but I would remove the blank line at least to make the else stick to the if block.

Copy link
Member Author

Choose a reason for hiding this comment

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

Done, since this was as much accidental as anything else

/* if we didn't make a tuple, then we're creating another reference */
Expand Down
0