File tree 1 file changed +11
-3
lines changed
1 file changed +11
-3
lines changed Original file line number Diff line number Diff line change @@ -245,7 +245,8 @@ def _maybe_get_mask(
245
245
"""
246
246
if mask is None :
247
247
if is_bool_dtype (values .dtype ) or is_integer_dtype (values .dtype ):
248
- return np .broadcast_to (False , values .shape )
248
+ # Boolean data cannot contain nulls, so signal via mask being None
249
+ return None
249
250
250
251
if skipna or needs_i8_conversion (values .dtype ):
251
252
mask = isna (values )
@@ -1435,8 +1436,15 @@ def _maybe_null_out(
1435
1436
Dtype
1436
1437
The product of all elements on a given axis. ( NaNs are treated as 1)
1437
1438
"""
1438
- if mask is not None and axis is not None and isinstance (result , np .ndarray ):
1439
- null_mask = (mask .shape [axis ] - mask .sum (axis ) - min_count ) < 0
1439
+ if axis is not None and isinstance (result , np .ndarray ):
1440
+ if mask is not None :
1441
+ null_mask = (mask .shape [axis ] - mask .sum (axis ) - min_count ) < 0
1442
+ else :
1443
+ # we have no nulls, kept mask=None in _maybe_get_mask
1444
+ below_count = shape [axis ] - min_count < 0
1445
+ new_shape = shape [:axis ] + shape [axis + 1 :]
1446
+ null_mask = np .broadcast_to (below_count , new_shape )
1447
+
1440
1448
if np .any (null_mask ):
1441
1449
if is_numeric_dtype (result ):
1442
1450
if np .iscomplexobj (result ):
You can’t perform that action at this time.
0 commit comments