Skip to content

Commit 065df25

Browse files
committed
remove unnecessary dropna
1 parent f140597 commit 065df25

File tree

1 file changed

+7
-11
lines changed

1 file changed

+7
-11
lines changed

pandas/core/groupby.py

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -108,11 +108,10 @@ def _groupby_function(name, alias, npfunc, numeric_only=True,
108108
@Substitution(name='groupby', f=name)
109109
@Appender(_doc_template)
110110
@Appender(_local_template)
111-
def f(self, dropna=True):
111+
def f(self):
112112
self._set_group_selection()
113113
try:
114-
return self._cython_agg_general(alias, numeric_only=numeric_only,
115-
dropna=dropna)
114+
return self._cython_agg_general(alias, numeric_only=numeric_only)
116115
except AssertionError as e:
117116
raise SpecificationError(str(e))
118117
except Exception:
@@ -362,7 +361,6 @@ def __init__(self, obj, keys=None, axis=0, level=None, dropna=True,
362361
self.group_keys = group_keys
363362
self.squeeze = squeeze
364363
self.mutated = kwargs.pop('mutated', False)
365-
self.dropna = dropna
366364

367365
if grouper is None:
368366
grouper, exclusions, obj = _get_grouper(obj, keys,
@@ -1529,14 +1527,13 @@ class BaseGrouper(object):
15291527
"""
15301528

15311529
def __init__(self, axis, groupings, sort=True, group_keys=True,
1532-
mutated=False, dropna=True):
1530+
mutated=False):
15331531
self._filter_empty_groups = self.compressed = len(groupings) != 1
15341532
self.axis = axis
15351533
self.groupings = groupings
15361534
self.sort = sort
15371535
self.group_keys = group_keys
15381536
self.mutated = mutated
1539-
self.dropna = dropna
15401537

15411538
@property
15421539
def shape(self):
@@ -2505,8 +2502,7 @@ def is_in_obj(gpr):
25052502
raise ValueError('No group keys passed!')
25062503

25072504
# create the internals grouper
2508-
grouper = BaseGrouper(group_axis, groupings, sort=sort, mutated=mutated,
2509-
dropna=dropna)
2505+
grouper = BaseGrouper(group_axis, groupings, sort=sort, mutated=mutated)
25102506

25112507
return grouper, exclusions, obj
25122508

@@ -3135,9 +3131,9 @@ def _iterate_slices(self):
31353131
continue
31363132
yield val, slicer(val)
31373133

3138-
def _cython_agg_general(self, how, numeric_only=True, dropna=True):
3134+
def _cython_agg_general(self, how, numeric_only=True):
31393135
new_items, new_blocks = self._cython_agg_blocks(
3140-
how, numeric_only=numeric_only, dropna=dropna)
3136+
how, numeric_only=numeric_only)
31413137
return self._wrap_agged_blocks(new_items, new_blocks)
31423138

31433139
def _wrap_agged_blocks(self, items, blocks):
@@ -3163,7 +3159,7 @@ def _wrap_agged_blocks(self, items, blocks):
31633159

31643160
_block_agg_axis = 0
31653161

3166-
def _cython_agg_blocks(self, how, numeric_only=True, dropna=True):
3162+
def _cython_agg_blocks(self, how, numeric_only=True):
31673163
data, agg_axis = self._get_data_to_aggregate()
31683164

31693165
new_blocks = []

0 commit comments

Comments
 (0)