Skip to content

Commit 22060d0

Browse files
committed
fixed groupby var
1 parent 1ea9664 commit 22060d0

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

pandas/core/groupby/groupby.py

+6-1
Original file line numberDiff line numberDiff line change
@@ -1168,7 +1168,12 @@ def var(self, ddof=1, *args, **kwargs):
11681168
"""
11691169
nv.validate_groupby_func('var', args, kwargs)
11701170
if ddof == 1:
1171-
return self._cython_agg_general('var', **kwargs)
1171+
try:
1172+
return self._cython_agg_general('var', **kwargs)
1173+
except Exception:
1174+
f = lambda x: x.var(ddof=ddof, **kwargs)
1175+
with _group_selection_context(self):
1176+
return self._python_agg_general(f)
11721177
else:
11731178
f = lambda x: x.var(ddof=ddof, **kwargs)
11741179
with _group_selection_context(self):

pandas/core/resample.py

+4-2
Original file line numberDiff line numberDiff line change
@@ -1043,15 +1043,17 @@ def _downsample(self, how, **kwargs):
10431043

10441044
if is_subperiod(ax.freq, self.freq):
10451045
# Downsampling
1046-
return self._groupby_and_aggregate(how, grouper=self.grouper)
1046+
return self._groupby_and_aggregate(how, grouper=self.grouper,
1047+
**kwargs)
10471048
elif is_superperiod(ax.freq, self.freq):
10481049
if how == 'ohlc':
10491050
# GH #13083
10501051
# upsampling to subperiods is handled as an asfreq, which works
10511052
# for pure aggregating/reducing methods
10521053
# OHLC reduces along the time dimension, but creates multiple
10531054
# values for each period -> handle by _groupby_and_aggregate()
1054-
return self._groupby_and_aggregate(how, grouper=self.grouper)
1055+
return self._groupby_and_aggregate(how, grouper=self.grouper,
1056+
**kwargs)
10551057
return self.asfreq()
10561058
elif ax.freq == self.freq:
10571059
return self.asfreq()

0 commit comments

Comments
 (0)