Skip to content

Commit 6611d3f

Browse files
committed
rebase
1 parent c35c717 commit 6611d3f

File tree

1 file changed

+1
-10
lines changed

1 file changed

+1
-10
lines changed

pandas/core/generic.py

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4193,7 +4193,7 @@ def between_time(self, start_time, end_time, include_start=True,
41934193

41944194
def resample(self, rule, how=None, axis=0, fill_method=None, closed=None,
41954195
label=None, convention='start', kind=None, loffset=None,
4196-
limit=None, base=0, on=None, level=None, fill_value=None):
4196+
limit=None, base=0, on=None, level=None):
41974197
"""
41984198
Convenience method for frequency conversion and resampling of time
41994199
series. Object must have a datetime-like index (DatetimeIndex,
@@ -4228,11 +4228,6 @@ def resample(self, rule, how=None, axis=0, fill_method=None, closed=None,
42284228
42294229
.. versionadded:: 0.19.0
42304230
4231-
fill_value: scalar, optional
4232-
Value to use for missing values, applied before resampling
4233-
4234-
.. version added:: 0.20.0
4235-
42364231
To learn more about the offset strings, please see `this link
42374232
<http://pandas.pydata.org/pandas-docs/stable/timeseries.html#offset-aliases>`__.
42384233
@@ -4337,10 +4332,6 @@ def resample(self, rule, how=None, axis=0, fill_method=None, closed=None,
43374332
from pandas.tseries.resample import (resample,
43384333
_maybe_process_deprecations)
43394334
axis = self._get_axis_number(axis)
4340-
4341-
if(fill_value is not None):
4342-
self = self.fillna(fill_value)
4343-
43444335
r = resample(self, freq=rule, label=label, closed=closed,
43454336
axis=axis, kind=kind, loffset=loffset,
43464337
convention=convention,

0 commit comments

Comments
 (0)