Skip to content
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

ENH: indexing and __getitem__ of dataframe and series accept zerodim integer np.array as int #24924

Merged
merged 14 commits into from
Feb 20, 2019
Merged

ENH: indexing and __getitem__ of dataframe and series accept zerodim integer np.array as int #24924

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
e38be24
ENH: df.iloc accepts zero dim integer np.array as int
tamuhey Jan 25, 2019
16bbaa9
test compares the result and expected value
tamuhey Jan 27, 2019
5fc0120
ENH: df.loc accepts zerodim integer np.array, and add test
tamuhey Jan 27, 2019
9bd6491
ENH: df.__getitem__ accepts zerodim integer np.array, and add test
tamuhey Jan 27, 2019
55d4cc3
add whatsnew, v0.25.0.rst
tamuhey Jan 27, 2019
721684f
add test and whatsnew about changes of pd.Series indexing and __getit…
tamuhey Jan 27, 2019
b8acbde
move tests of df.__getitem__ and s.__getitem__ to tests/indexing/test…
tamuhey Jan 28, 2019
8d4c9a1
CLN: remove redundant comment, and name series as s
tamuhey Jan 28, 2019
83a1963
modified: doc/source/whatsnew/v0.25.0.rst
tamuhey Jan 29, 2019
b979434
fix whatsnew
tamuhey Feb 2, 2019
760a3a3
Merge branch 'master' into iss24919_df_iloc_support_zero_dim_np_array
tamuhey Feb 2, 2019
71de442
Merge branch master into test
tamuhey Feb 17, 2019
7e5c8d8
Merge branch 'master' into iss24919_df_iloc_support_zero_dim_np_array
tamuhey Feb 18, 2019
3242e29
modified: doc/source/whatsnew/v0.25.0.rst
tamuhey Feb 19, 2019
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
2 changes: 2 additions & 0 deletions pandas/core/indexing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import numpy as np

from pandas._libs.indexing import _NDFrameIndexerBase
from pandas._libs.lib import item_from_zerodim
import pandas.compat as compat
from pandas.compat import range, zip
from pandas.errors import AbstractMethodError
Expand Down Expand Up @@ -2222,6 +2223,7 @@ def _getitem_axis(self, key, axis=None):

# a single integer
else:
key = item_from_zerodim(key)
if not is_integer(key):
raise TypeError("Cannot index by location index with a "
"non-integer key")
Expand Down
7 changes: 7 additions & 0 deletions pandas/tests/indexing/test_iloc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -675,3 +675,10 @@ def test_identity_slice_returns_new_object(self):
# should also be a shallow copy
original_series[:3] = [7, 8, 9]
assert all(sliced_series[:3] == [7, 8, 9])

def test_indexing_zero_dim_np_array(self):
# GH24919
df = DataFrame([[1, 2], [3, 4]])

# should not raise an error
Copy link
Contributor

Choose a reason for hiding this comment

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

these comments are not needed (and same below)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done!

df.iloc[np.array(0)]