updates

Author: TomAugspurger

pandas/core/arrays/boolean.py

@@ -575,10 +575,11 @@ def logical_method(self, other):
                     raise NotImplementedError(
                         "can only perform ops with 1-d structures"
                     )
-                if len(self) != len(other):
-                    raise ValueError("Lengths must match to compare")
                 other, mask = coerce_to_array(other, copy=False)
 
+            if not lib.is_scalar(other) and len(self) != len(other):
+                raise ValueError("Lengths must match to compare")
+
             if op.__name__ in {"or_", "ror_"}:
                 result, mask = kleene_or(self._data, other, self._mask, mask)
                 return BooleanArray(result, mask)

pandas/tests/arrays/test_boolean.py

@@ -360,45 +360,19 @@ def get_op_from_name(self, op_name):
 
         return op
 
-    def _compare_other(self, data, op_name, other):
-        op = self.get_op_from_name(op_name)
-
-        # array
-        result = pd.Series(op(data, other))
-        expected = pd.Series(op(data._data, other), dtype="boolean")
-
-        # fill the nan locations
-        expected[data._mask] = np.nan
-
-        tm.assert_series_equal(result, expected)
-
-        # series
-        s = pd.Series(data)
-        result = op(s, other)
-
-        expected = pd.Series(data._data)
-        expected = op(expected, other)
-        expected = pd.Series(expected, dtype="boolean")
-
-        # fill the nan locations
-        expected[data._mask] = np.nan
+    def test_logical_length_mismatch_raises(self, all_logical_operators):
+        op_name = all_logical_operators
+        a = pd.array([True, False, None], dtype="boolean")
+        msg = "Lengths must match to compare"
 
-        tm.assert_series_equal(result, expected)
+        with pytest.raises(ValueError, match=msg):
+            getattr(a, op_name)([True, False])
 
-    def test_scalar(self, data, all_logical_operators):
-        op_name = all_logical_operators
-        self._compare_other(data, op_name, True)
+        with pytest.raises(ValueError, match=msg):
+            getattr(a, op_name)(np.array([True, False]))
 
-    def test_array(self, data, all_logical_operators):
-        op_name = all_logical_operators
-        if "or" in op_name:
-            pytest.skip("confusing")
-        other = pd.array([True] * len(data), dtype="boolean")
-        self._compare_other(data, op_name, other)
-        other = np.array([True] * len(data))
-        self._compare_other(data, op_name, other)
-        other = pd.Series([True] * len(data), dtype="boolean")
-        self._compare_other(data, op_name, other)
+        with pytest.raises(ValueError, match=msg):
+            getattr(a, op_name)(pd.array([True, False], dtype="boolean"))
 
     def test_kleene_or(self):
         # A clear test of behavior.
@@ -431,27 +405,6 @@ def test_kleene_or_scalar(self, other, expected):
         result = other | a
         tm.assert_extension_array_equal(result, expected)
 
-    @pytest.mark.parametrize(
-        "left,right,expected",
-        [
-            ([True, False, None], True, [True, True, True]),
-            ([True, False, None], False, [True, False, None]),
-            ([True, False, None], np.nan, [True, None, None]),
-            # TODO: pd.NA
-        ],
-    )
-    def test_kleene_or_cases(self, left, right, expected):
-        if isinstance(left, list):
-            left = pd.array(left, dtype="boolean")
-        if isinstance(right, list):
-            right = pd.array(right, dtype="boolean")
-        expected = pd.array(expected, dtype="boolean")
-        result = left | right
-        tm.assert_extension_array_equal(result, expected)
-
-        result = right | left
-        tm.assert_extension_array_equal(result, expected)
-
     def test_kleene_and(self):
         # A clear test of behavior.
         a = pd.array([True] * 3 + [False] * 3 + [None] * 3, dtype="boolean")