8000 BUG: Issues with DatetimeTZ values in where and combine_first (#21469 + #21546) by Liam3851 · Pull Request #21660 · pandas-dev/pandas · GitHub
[go: up one dir, main page]
Skip to content

BUG: Issues with DatetimeTZ values in where and combine_first (#21469 + #21546) #21660

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 14 commits into from
Jul 2, 2018
Merged

BUG: Issues with DatetimeTZ values in where and combine_first (#21469 + #21546) #21660

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
ac2f836
Minimal modifications that pass new tests and fix #21469 + #21546.
Liam3851 Jun 27, 2018
770a22e
Remove unused import.
Liam3851 Jun 27, 2018
04a0538
Remove explicit DatetimeTZBlock check.
Liam3851 Jun 27, 2018
6e6c619
Update test_coercion; xfailing case now fixed.
Liam3851 Jun 27, 2018
8c022d9
Remove orphaned private _where_compat method.
Liam3851 Jun 27, 2018
96a59f6
Remove newly-unused import
Liam3851 Jun 28, 2018
deda82c
Merge remote-tracking branch 'upstream/master' into where_tz
Liam3851 Jun 28, 2018
71a4fd4
Remove no-longer-relevant comment and no-op code line.
Liam3851 Jun 29, 2018
7c14643
Clean up unit tests.
Liam3851 Jun 29, 2018
3d072c5
Fix unneeded imports.
Liam3851 Jun 29, 2018
f812e78
Add whatsnew.
Liam3851 Jun 29, 2018
f177ec5
Merge remote-tracking branch 'upstream/master' into where_tz
Liam3851 Jun 29, 2018
09fe18f
Merge branch 'master' into PR_TOOL_MERGE_PR_21660
jreback Jul 2, 2018
c97b951
doc
jreback Jul 2, 2018
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
Remove orphaned private _where_compat method.
  • Loading branch information
@Liam3851
Liam3851 committed Jun 27, 2018
commit 8c022d96e1a7f8308b246c2b8159cdb51b66c79f
13 changes: 0 additions & 13 deletions pandas/core/common.py
View file
Open in desktop
4387
Original file line number Diff line number Diff line change
Expand Up @@ -410,19 +410,6 @@ def _apply_if_callable(maybe_callable, obj, **kwargs):
return maybe_callable


def _where_compat(mask, arr1, arr2):
Copy link
Contributor

Choose a reason for hiding this comment

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

nice!

if arr1.dtype == _NS_DTYPE and arr2.dtype == _NS_DTYPE:
new_vals = np.where(mask, arr1.view('i8'), arr2.view('i8'))
return new_vals.view(_NS_DTYPE)

if arr1.dtype == _NS_DTYPE:
arr1 = tslib.ints_to_pydatetime(arr1.view('i8'))
if arr2.dtype == _NS_DTYPE:
arr2 = tslib.ints_to_pydatetime(arr2.view('i8'))

return np.where(mask, arr1, arr2)


def _dict_compat(d):
"""
Helper function to convert datetimelike-keyed dicts to Timestamp-keyed dict
Expand Down
0