Skip to content

TYP: __getitem__ method of EA (2nd pass) #37921

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 5 commits into from
Closed

TYP: __getitem__ method of EA (2nd pass) #37921

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3d023db
TYP: __getitem__ method of EA (2nd pass)
simonjayhawkins Nov 17, 2020
06abda1
Merge remote-tracking branch 'upstream/master' into follow-up-EA-getitem
simonjayhawkins Nov 17, 2020
2f52aa6
fix circular import
simonjayhawkins Nov 17, 2020
f9fb7f5
move assert after ndim check
simonjayhawkins Nov 18, 2020
be12bc6
fix assert
simonjayhawkins Nov 18, 2020
File filter

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
Merge remote-tracking branch 'upstream/master' into follow-up-EA-getitem
  • Loading branch information
@simonjayhawkins
simonjayhawkins committed Nov 17, 2020
commit 06abda1217a72b0c1e401eb4eba9d85e672a63af
7 changes: 3 additions & 4 deletions pandas/core/indexes/datetimelike.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -773,10 +773,9 @@ def intersection(self, other, sort=False):
else:
lslice = slice(*left.slice_locs(start, end))
left_chunk = left._values[lslice]
# pandas\core\indexes\datetimelike.py:776: error: Argument 1 to
# "_simple_new" of "DatetimeIndexOpsMixin" has incompatible type
# "Union[ExtensionArray, Any]"; expected "Union[DatetimeArray,
# TimedeltaArray, PeriodArray]" [arg-type]
# error: Argument 1 to "_simple_new" of "DatetimeIndexOpsMixin" has
# incompatible type "Union[ExtensionArray, Any]"; expected
# "Union[DatetimeArray, TimedeltaArray, PeriodArray]" [arg-type]
result = type(self)._simple_new(left_chunk) # type: ignore[arg-type]

return self._wrap_setop_result(other, result)
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.