Skip to content

API: change datetimelike Index to raise IndexError instead ValueError #18386

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 3 commits into from
Dec 1, 2017
Merged

API: change datetimelike Index to raise IndexError instead ValueError #18386

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3bf0378
API: change datetimelike Index to raise IndexError instead ValueError
jorisvandenbossche Nov 20, 2017
795a0f3
Merge remote-tracking branch 'upstream/master' into dtindex-index-val…
jorisvandenbossche Nov 30, 2017
27931f6
simplify test + add whatsnew
jorisvandenbossche Nov 30, 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
4 changes: 3 additions & 1 deletion pandas/core/indexes/datetimelike.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,9 @@ def __getitem__(self, key):

is_int = is_integer(key)
if is_scalar(key) and not is_int:
raise ValueError
raise IndexError("only integers, slices (`:`), ellipsis (`...`), "
"numpy.newaxis (`None`) and integer or boolean "
"arrays are valid indices")

getitem = self._data.__getitem__
if is_int:
Expand Down
17 changes: 12 additions & 5 deletions pandas/tests/indexes/test_base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -591,12 +591,19 @@ def test_empty_fancy(self):
# Index.
pytest.raises(IndexError, idx.__getitem__, empty_farr)

def test_getitem(self):
Copy link
Contributor

Choose a reason for hiding this comment

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

this original test is pretty useless, so no need to keep its function (and this is tested else in many places as well)
all of the indexes have a test_indexing.py

Copy link
Contributor

Choose a reason for hiding this comment

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

just rename the test to test_getitem_error. if you want you can split this out into a new file, test_indexing.py in this dir.

arr = np.array(self.dateIndex)
exp = self.dateIndex[5]
exp = _to_m8(exp)
def test_getitem(self, indices):

assert exp == arr[5]
if indices.size != 100:
Copy link
Contributor

Choose a reason for hiding this comment

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

why do you have this?

return

exp = getattr(indices, '_box_func', lambda x: x)(indices._values[0])
Copy link
Member Author

Choose a reason for hiding this comment

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

This is a bit too much 'internal-details-relying' for a test, but I didn't directly know a way to write it generic for all types of index instead (or maybe we just shouldn't try, and keep it only testing the errors)

Copy link
Contributor

Choose a reason for hiding this comment

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

you don't need this at all, just check for the error

assert indices[0] == exp

with pytest.raises(IndexError):
indices[101]

with pytest.raises(IndexError):
indices['no_int']

def test_intersection(self):
first = self.strIndex[:20]
Expand Down