Skip to content

CLN: de-duplicate boxing in DTI.get_value #30819

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
Jan 9, 2020
Merged

CLN: de-duplicate boxing in DTI.get_value #30819

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2aa4018
CLN: handle np.datetime64 at the same time as datetime in DTI.get_value
jbrockmendel Jan 8, 2020
6580fc4
wrap in Timestamp in fewer places
jbrockmendel Jan 8, 2020
1c01450
prune redundant
jbrockmendel Jan 8, 2020
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
10 changes: 1 addition & 9 deletions pandas/core/indexes/datetimes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -641,15 +641,7 @@ def get_value(self, series, key):
know what you're doing
"""

if isinstance(key, datetime):

# needed to localize naive datetimes
if self.tz is not None:
if key.tzinfo is not None:
key = Timestamp(key).tz_convert(self.tz)
else:
key = Timestamp(key).tz_localize(self.tz)

if isinstance(key, (datetime, np.datetime64)):
return self.get_value_maybe_box(series, key)
Copy link
Member Author

Choose a reason for hiding this comment

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

the removed code here is duplicated in get_value_maybe_box


if isinstance(key, time):
Expand Down
17 changes: 17 additions & 0 deletions pandas/tests/indexes/datetimes/test_indexing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -613,6 +613,23 @@ def test_delete_slice(self):
assert result.freq == expected.freq
assert result.tz == expected.tz

def test_get_value(self):
# specifically make sure we have test for np.datetime64 key
dti = pd.date_range("2016-01-01", periods=3)

arr = np.arange(6, 8)

key = dti[1]

result = dti.get_value(arr, key)
assert result == 7

result = dti.get_value(arr, key.to_pydatetime())
assert result == 7

result = dti.get_value(arr, key.to_datetime64())
assert result == 7

def test_get_loc(self):
idx = pd.date_range("2000-01-01", periods=3)

Expand Down