-
-
Notifications
You must be signed in to change notification settings - Fork 18.5k
API: consistent __array__ for datetime-like ExtensionArrays #23593
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.
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
jreback
merged 18 commits into
pandas-dev:master
from
jorisvandenbossche:ea-array-protocol
Jan 5, 2019
Merged
Changes from all commits
Commits
Show all changes
18 commits
Select commit
Hold shift + click to select a range
8ebe597
API: consistent __array__ for datetime-like ExtensionArrays
jorisvandenbossche 6e8eaff
temp override DatetimelikeIndex.__array__
jorisvandenbossche 9506fef
fix isort
jorisvandenbossche bade9e4
Merge remote-tracking branch 'upstream/master' into ea-array-protocol
jorisvandenbossche 8c68e2a
fixes for changes in master
jorisvandenbossche d8f24fd
Merge remote-tracking branch 'upstream/master' into ea-array-protocol
jorisvandenbossche 39bae20
fix import
jorisvandenbossche 3a9c368
Merge remote-tracking branch 'upstream/master' into ea-array-protocol
jorisvandenbossche 55c6cb9
small clean-up
jorisvandenbossche b60c81e
Merge remote-tracking branch 'upstream/master' into jorisvandenbossch…
TomAugspurger eb6c8bd
Merge remote-tracking branch 'upstream/master' into ea-array-protocol
jorisvandenbossche c5404d7
add tests for other dtypes
jorisvandenbossche d9ab5bf
clean-up merge
jorisvandenbossche b51c4b3
linting
jorisvandenbossche 79908d1
Merge remote-tracking branch 'upstream/master' into ea-array-protocol
jorisvandenbossche 1112420
small clean-up tests
jorisvandenbossche e284aad
add tests for case of specifying its own dtype
jorisvandenbossche 4120586
Merge remote-tracking branch 'upstream/master' into jorisvandenbossch…
TomAugspurger 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
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -391,6 +391,12 @@ def _formatter(self, boxed=False): | |
def nbytes(self): | ||
return self._data.nbytes | ||
|
||
def __array__(self, dtype=None): | ||
# used for Timedelta/DatetimeArray, overwritten by PeriodArray | ||
if is_object_dtype(dtype): | ||
return np.array(list(self), dtype=object) | ||
return self._data | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I would raise if dtype not in [None, object] |
||
|
||
@property | ||
def shape(self): | ||
return (len(self),) | ||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.