BUG: Concat with tz-aware and timedelta raises AttributeError #12635
+35
−23
Conversation
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
| new_values = np.concatenate([x.view(np.int64) for x in to_concat], | ||
| axis=axis) | ||
| return new_values.view(_NS_DTYPE) | ||
|
|
||
| elif not len(typs - set(['timedelta'])): | ||
| elif 'timedelta' in typs: | ||
| new_values = np.concatenate([x.view(np.int64) for x in to_concat], | ||
| axis=axis) | ||
| return new_values.view(_TD_DTYPE) | ||
|
|
||
| # need to coerce to object | ||
| to_concat = [convert_to_pydatetime(x, axis) for x in to_concat] |
There was a problem hiding this comment.
looking at this now, I suspect this is a bug here, which I believe you have in another issue. Eg. a timedelta and a datetime (with or w/o tz) may be conveted to object, BUT they go thru the convert_to_datetime which is incorrect for timedelta.
There was a problem hiding this comment.
convert_to_pydatetime is defined in directly above, and it has a logic for timedelta. Doesn't current test case test_concat_tz_series_with_datetimelike cover your case?
There was a problem hiding this comment.
I think this hits here: #12620
|
sinhrks
force-pushed
the
tz_concat_object
branch
from
9ea31e4 to
45d1ecd
Compare
|
thanks @sinhrks |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
git diff upstream/master | flake8 --diff@jreback 's comment on #12620:
I added number of
dtypecheck logic intseries/common/_concat_compat. But it should work onbase/common/_concat_compat. Lmk which is preferable.