-
-
Notifications
You must be signed in to change notification settings - Fork 18.4k
CLN: remove unnecessary Series._convert calls #32949
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
Merged
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
89c324e
CLN: remove unnecessary Series._convert calls
jbrockmendel c074163
Merge branch 'master' of https://github.com/pandas-dev/pandas into cl…
jbrockmendel 3b11378
Merge branch 'master' of https://github.com/pandas-dev/pandas into cl…
jbrockmendel 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
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 |
---|---|---|
|
@@ -29,7 +29,7 @@ | |
|
||
import numpy as np | ||
|
||
from pandas._libs import Timestamp, lib | ||
from pandas._libs import lib | ||
from pandas._typing import FrameOrSeries | ||
from pandas.util._decorators import Appender, Substitution | ||
|
||
|
@@ -386,7 +386,7 @@ def _wrap_aggregated_output( | |
result = self._wrap_series_output( | ||
output=output, index=self.grouper.result_index | ||
) | ||
return self._reindex_output(result)._convert(datetime=True) | ||
return self._reindex_output(result) | ||
|
||
def _wrap_transformed_output( | ||
self, output: Mapping[base.OutputKey, Union[Series, np.ndarray]] | ||
|
@@ -1342,14 +1342,10 @@ def first_not_none(values): | |
|
||
# values are not series or array-like but scalars | ||
else: | ||
# only coerce dates if we find at least 1 datetime | ||
should_coerce = any(isinstance(x, Timestamp) for x in values) | ||
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. Does this change behaviour? |
||
# self._selection_name not passed through to Series as the | ||
# result should not take the name of original selection | ||
# of columns | ||
return Series(values, index=key_index)._convert( | ||
datetime=True, coerce=should_coerce | ||
) | ||
return Series(values, index=key_index) | ||
|
||
else: | ||
# Handle cases like BinGrouper | ||
|
@@ -1699,7 +1695,7 @@ def _wrap_aggregated_output( | |
if self.axis == 1: | ||
result = result.T | ||
|
||
return self._reindex_output(result)._convert(datetime=True) | ||
return self._reindex_output(result) | ||
|
||
def _wrap_transformed_output( | ||
self, output: Mapping[base.OutputKey, Union[Series, np.ndarray]] | ||
|
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do you have an explanation of why this is not needed anymore?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No, just an observation that we dont have any tests that break without it.