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

chore: Refactor validate_column_comparand #1102

Merged
merged 2 commits into from
Oct 1, 2024
Merged

chore: Refactor validate_column_comparand #1102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fd69d7b
simplify
MarcoGorelli Sep 30, 2024
6906cbf
rename argument
MarcoGorelli Sep 30, 2024
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
8 changes: 3 additions & 5 deletions narwhals/_pandas_like/series.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -619,11 +619,9 @@ def quantile(

def zip_with(self: Self, mask: Any, other: Any) -> PandasLikeSeries:
ser = self._native_series
mask = validate_column_comparand(ser.index, mask)
if isinstance(mask, str) or not isinstance(
mask, (self.__native_namespace__().Series, Sequence)
):
mask = [mask]
mask = validate_column_comparand(
ser.index, mask, treat_length_one_as_scalar=False
)
other = validate_column_comparand(ser.index, other)
res = ser.where(mask, other)
return self._from_native_series(res)
Expand Down
6 changes: 4 additions & 2 deletions narwhals/_pandas_like/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,9 @@
}


def validate_column_comparand(index: Any, other: Any) -> Any:
def validate_column_comparand(
index: Any, other: Any, *, treat_length_one_as_scalar: bool = True
) -> Any:
"""Validate RHS of binary operation.

If the comparison isn't supported, return `NotImplemented` so that the
Expand All @@ -50,7 +52,7 @@ def validate_column_comparand(index: Any, other: Any) -> Any:
if isinstance(other, PandasLikeDataFrame):
return NotImplemented
if isinstance(other, PandasLikeSeries):
if other.len() == 1:
if other.len() == 1 and treat_length_one_as_scalar:
# broadcast
return other.item()
if other._native_series.index is not index:
Expand Down
Loading