Skip to content

Commit d411516

Browse files
committed
Revert & update test
1 parent 642e3bc commit d411516

File tree

2 files changed

+10
-11
lines changed

2 files changed

+10
-11
lines changed

pandas/core/arrays/masked.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
from pandas.core.dtypes.base import ExtensionDtype
3434
from pandas.core.dtypes.cast import (
3535
maybe_downcast_to_dtype,
36-
maybe_unbox_numpy_scalar,
3736
)
3837
from pandas.core.dtypes.common import (
3938
is_bool,
@@ -1770,7 +1769,7 @@ def any(
17701769

17711770
values = self._data.copy()
17721771
np.putmask(values, self._mask, self.dtype._falsey_value)
1773-
result = maybe_unbox_numpy_scalar(values.any())
1772+
result = values.any()
17741773
if skipna:
17751774
return result
17761775
else:
@@ -1856,7 +1855,7 @@ def all(
18561855

18571856
values = self._data.copy()
18581857
np.putmask(values, self._mask, self.dtype._truthy_value)
1859-
result = maybe_unbox_numpy_scalar(values.all(axis=axis))
1858+
result = values.all(axis=axis)
18601859

18611860
if skipna:
18621861
return result

pandas/tests/arrays/boolean/test_reduction.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,22 +25,22 @@ def data():
2525
([False, False], False, False, False, False),
2626
],
2727
)
28+
@pytest.mark.parametrize("con", [pd.array, pd.Series])
2829
def test_any_all(
29-
values, exp_any, exp_all, exp_any_noskip, exp_all_noskip, using_python_scalars
30+
values, exp_any, exp_all, exp_any_noskip, exp_all_noskip, using_python_scalars, con
3031
):
3132
# the methods return numpy scalars
32-
if not using_python_scalars:
33+
if not using_python_scalars or con is pd.array:
3334
exp_any = pd.NA if exp_any is pd.NA else np.bool_(exp_any)
3435
exp_all = pd.NA if exp_all is pd.NA else np.bool_(exp_all)
3536
exp_any_noskip = pd.NA if exp_any_noskip is pd.NA else np.bool_(exp_any_noskip)
3637
exp_all_noskip = pd.NA if exp_all_noskip is pd.NA else np.bool_(exp_all_noskip)
3738

38-
for con in [pd.array, pd.Series]:
39-
a = con(values, dtype="boolean")
40-
assert a.any() is exp_any
41-
assert a.all() is exp_all
42-
assert a.any(skipna=False) is exp_any_noskip
43-
assert a.all(skipna=False) is exp_all_noskip
39+
a = con(values, dtype="boolean")
40+
assert a.any() is exp_any
41+
assert a.all() is exp_all
42+
assert a.any(skipna=False) is exp_any_noskip
43+
assert a.all(skipna=False) is exp_all_noskip
4444

4545

4646
def test_reductions_return_types(

0 commit comments

Comments
 (0)