Skip to content

REF: remove Block.putmask fallback to where #45440

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

Merged
merged 6 commits into from
Jan 22, 2022
Merged

REF: remove Block.putmask fallback to where #45440

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c5e1276
CI: py38 builds
jbrockmendel Jan 18, 2022
a59debc
troubleshoot
jbrockmendel Jan 18, 2022
14f8172
REF: remove Block.putmask fallback to where
jbrockmendel Jan 18, 2022
aba56c6
py38 compat
jbrockmendel Jan 18, 2022
ef52195
Merge branch 'main' into experiment
jbrockmendel Jan 18, 2022
bcdeb75
Merge branch 'main' into experiment
jbrockmendel Jan 19, 2022
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
2 changes: 2 additions & 0 deletions pandas/core/array_algos/putmask.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,8 @@ def putmask_without_repeat(
mask : np.ndarray[bool]
new : Any
"""
new = setitem_datetimelike_compat(values, mask.sum(), new)

if getattr(new, "ndim", 0) >= 1:
new = new.astype(values.dtype, copy=False)

Expand Down
8 changes: 0 additions & 8 deletions pandas/core/internals/blocks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
Shape,
npt,
)
from pandas.compat import np_version_under1p20
from pandas.util._decorators import cache_readonly
from pandas.util._exceptions import find_stack_level
from pandas.util._validators import validate_bool_kwarg
Expand All @@ -39,7 +38,6 @@
from pandas.core.dtypes.cast import (
can_hold_element,
find_result_type,
infer_dtype_from,
maybe_downcast_numeric,
maybe_downcast_to_dtype,
soft_convert_objects,
Expand Down Expand Up @@ -988,12 +986,6 @@ def putmask(self, mask, new) -> list[Block]:
putmask_without_repeat(values.T, mask, new)
return [self]

elif np_version_under1p20 and infer_dtype_from(new)[0].kind in ["m", "M"]:
# using putmask with object dtype will incorrectly cast to object
# Having excluded self._can_hold_element, we know we cannot operate
# in-place, so we are safe using `where`
return self.where(new, ~mask)

elif noop:
return [self]

Expand Down