Skip to content
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

Jump to bottom

[REDO] CLN: core/dtypes/cast.py::maybe_downcast_to_dtype #37126

Merged
merged 11 commits into from
Oct 17, 2020
Merged

[REDO] CLN: core/dtypes/cast.py::maybe_downcast_to_dtype #37126

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
5cb5cf9
CLN: rewrite try/except/pass using contextlib.suppress
arw2019 Oct 10, 2020
586e2c7
use is_period_dtype to check type
arw2019 Oct 10, 2020
0f08c52
clean up if condition
arw2019 Oct 10, 2020
31a3d40
add is_datetime_or_timedelta_any_dtype helper to dtypes/common
arw2019 Oct 10, 2020
3197ff6
enact TODO: relocate PeriodArray block
arw2019 Oct 11, 2020
04ece89
feedback: revert changes to dtype checks
arw2019 Oct 11, 2020
d5f6d66
reorder clause
arw2019 Oct 11, 2020
1967511
feedback: collapse datetimelike if body
arw2019 Oct 11, 2020
5303504
revert datelike if-else body
arw2019 Oct 11, 2020
7619e8b
feedback: revert datetimelike block
arw2019 Oct 12, 2020
048508b
TYP: add correct type hint for maybe_downcast_to_dtype
arw2019 Oct 15, 2020
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
24 changes: 11 additions & 13 deletions pandas/core/dtypes/cast.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
Routines for casting.
"""

from contextlib import suppress
from datetime import date, datetime, timedelta
from typing import (
TYPE_CHECKING,
Expand Down Expand Up @@ -133,7 +134,7 @@ def is_nested_object(obj) -> bool:
return False


def maybe_downcast_to_dtype(result, dtype: Dtype):
def maybe_downcast_to_dtype(result, dtype: Union[str, np.dtype]):
Copy link
Contributor

Choose a reason for hiding this comment

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

this is not correct, DtypeObj right

Copy link
Member Author

Choose a reason for hiding this comment

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

has to be a numpy type or str according to mypy. When I put it DtypeObj mypy errors:

pandas/core/dtypes/cast.py:180: error: Item "ExtensionDtype" of "Union[Any, ExtensionDtype]" has no attribute "freq"  [union-attr]

"""
try to cast to the specified dtype (e.g. convert back to bool/int
or could be an astype of float64->float32
Expand Down Expand Up @@ -169,12 +170,20 @@ def maybe_downcast_to_dtype(result, dtype: Dtype):

dtype = np.dtype(dtype)

elif dtype.type is Period:
from pandas.core.arrays import PeriodArray

with suppress(TypeError):
# e.g. TypeError: int() argument must be a string, a
# bytes-like object or a number, not 'Period
return PeriodArray(result, freq=dtype.freq)

converted = maybe_downcast_numeric(result, dtype, do_round)
if converted is not result:
return converted

# a datetimelike
# GH12821, iNaT is casted to float
# GH12821, iNaT is cast to float
if dtype.kind in ["M", "m"] and result.dtype.kind in ["i", "f"]:
if hasattr(dtype, "tz"):
# not a numpy dtype
Expand All @@ -187,17 +196,6 @@ def maybe_downcast_to_dtype(result, dtype: Dtype):
else:
result = result.astype(dtype)

elif dtype.type is Period:
# TODO(DatetimeArray): merge with previous elif
from pandas.core.arrays import PeriodArray

try:
return PeriodArray(result, freq=dtype.freq)
except TypeError:
# e.g. TypeError: int() argument must be a string, a
# bytes-like object or a number, not 'Period
pass

return result


Expand Down