8000 ENH: Better error message for invalid axis by shoyer · Pull Request #7916 · numpy/numpy · GitHub
[go: up one dir, main page]
Skip to content

ENH: Better error message for invalid axis #7916

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

Closed
wants to merge 2 commits into from
Closed

ENH: Better error message for invalid axis #7916

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4e54717
ENH: Better error message for invalid axis
shoyer Aug 7, 2016
486382a
Fixes
shoyer Sep 15, 2016
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
ENH: Better error message for invalid axis 
xref GH7915

Currently, writing array.max(axis=[0, 1]) doesn't mention you can use a tuple
for the axis argument -- it just says "an integer is required".
  • Loading branch information
@shoyer
shoyer committed Aug 7, 2016
commit 4e54717928848de473175500965d578bfaaf457b
2 changes: 1 addition & 1 deletion numpy/core/src/multiarray/conversion_utils.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ PyArray_ConvertMultiAxis(PyObject *axis_in, int ndim, npy_bool *out_axis_flags)
memset(out_axis_flags, 0, ndim);

axis = PyArray_PyIntAsInt_ErrMsg(axis_in,
"an integer is required for the axis");
"an integer or tuple is required for the axis");
Copy link
Member

Choose a reason for hiding this comment

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

Maybe tuple of integers?

axis_orig = axis;

if (error_converting(axis)) {
Expand Down
7 changes: 4 additions & 3 deletions numpy/core/tests/test_ufunc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
from numpy.core.test_rational import rational, test_add, test_add_rationals
from numpy.testing import (
TestCase, run_module_suite, assert_, assert_equal, assert_raises,
assert_array_equal, assert_almost_equal, assert_array_almost_equal,
assert_no_warnings
assert_raises_regex, assert_array_equal, assert_almost_equal,
assert_array_almost_equal, assert_no_warnings
)


Expand Down Expand Up

@@ -1197,6 +1197,7 @@ def test_reduce_arguments(self):
assert_raises(TypeError, f, d, axis="invalid")
assert_raises(TypeError, f, d, axis="invalid", dtype=None,
keepdims=True)
assert_raises_regex(TypeError, "integer or tuple", f, d, axis=[0])
Copy link
Member

Choose a reason for hiding this comment

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

Apparently a list raises a different error.

Copy link
Member

Choose a reason for hiding this comment

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

Seems to come from python rather than numpy.

Copy link
Contributor

Choose a reason for hiding this comment

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

it comes from the PyNumber_Index here https://github.com/numpy/numpy/blob/master/numpy/core/src/multiarray/conversion_utils.c#L848

# invalid dtype
assert_raises(TypeError, f, d, 0, "invalid")
assert_raises(TypeError, f, d, dtype="invalid")
Expand All @@ -1212,7 +1213,7 @@ def test_reduce_arguments(self):
assert_raises(TypeError, f, d, 0, keepdims="invalid", dtype="invalid",
out=None)

# invalid keyord
# invalid keyword
assert_raises(TypeError, f, d, axis=0, dtype=None, invalid=0)
assert_raises(TypeError, f, d, invalid=0)
assert_raises(TypeError, f, d, 0, keepdims=True, invalid="invalid",
Expand Down
0