Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 1 addition & 1 deletion pandas/core/arrays/boolean.py
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,7 @@ def _logical_method(self, other, op): # type: ignore[override]
elif is_list_like(other):
other = np.asarray(other, dtype="bool")
if other.ndim > 1:
raise NotImplementedError("can only perform ops with 1-d structures")
return NotImplemented
other, mask = coerce_to_array(other, copy=False)
elif isinstance(other, np.bool_):
other = other.item()
Expand Down
13 changes: 13 additions & 0 deletions pandas/tests/arithmetic/test_numeric.py
Original file line number Diff line number Diff line change
Expand Up @@ -862,6 +862,19 @@ def test_modulo_zero_int(self):
expected = Series([np.nan, 0.0])
tm.assert_series_equal(result, expected)

def test_non_1d_ea_raises_notimplementederror(self):
# GH#61866
ea_array = array([1, 2, 3, 4, 5], dtype="Int64").reshape(5, 1)
np_array = np.array([1, 2, 3, 4, 5], dtype=np.int64).reshape(5, 1)

msg = "can only perform ops with 1-d structures"

with pytest.raises(NotImplementedError, match=msg):
ea_array * np_array

with pytest.raises(NotImplementedError, match=msg):
np_array * ea_array


class TestAdditionSubtraction:
# __add__, __sub__, __radd__, __rsub__, __iadd__, __isub__
Expand Down
Loading