Cleanup

Author: dcherian

flox/aggregate_flox.py

@@ -99,11 +99,7 @@ def nansum_of_squares(group_idx, array, *, axis=-1, size=None, fill_value=None,
 
 
 def nanlen(group_idx, array, *args, **kwargs):
-    if np.issubdtype(array.dtype, bool):
-        array = ~array
-    else:
-        array = ~isnull(array)
-    return sum(group_idx, array.view(np.int8), *args, **kwargs)
+    return sum(group_idx, (~isnull(array)).view(np.int8), *args, **kwargs)
 
 
 def mean(group_idx, array, *, axis=-1, size=None, fill_value=None, dtype=None):
@@ -122,5 +118,5 @@ def nanmean(group_idx, array, *, axis=-1, size=None, fill_value=None, dtype=None
     masked = np.where(mask, 0, array)
     out = sum(group_idx, masked, size=size, axis=axis, dtype=dtype, fill_value=fill_value)
     with np.errstate(invalid="ignore", divide="ignore"):
-        out /= nanlen(group_idx, mask, size=size, axis=axis, fill_value=0, dtype=np.intp)
+        out /= sum(group_idx, mask.view(np.int8), size=size, axis=axis, fill_value=0, dtype=np.intp)
     return out