Skip to content

Commit 0201de2

Browse files
committed
rebase
1 parent 87448b4 commit 0201de2

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
@@ -4129,7 +4129,7 @@ def between_time(self, start_time, end_time, include_start=True,
41294129

41304130
def resample(self, rule, how=None, axis=0, fill_method=None, closed=None,
41314131
label=None, convention='start', kind=None, loffset=None,
4132-
limit=None, base=0, on=None, level=None, fill_value=None):
4132+
limit=None, base=0, on=None, level=None):
41334133
"""
41344134
Convenience method for frequency conversion and resampling of time
41354135
series. Object must have a datetime-like index (DatetimeIndex,
@@ -4164,11 +4164,6 @@ def resample(self, rule, how=None, axis=0, fill_method=None, closed=None,
41644164
41654165
.. versionadded:: 0.19.0
41664166
4167-
fill_value: scalar, optional
4168-
Value to use for missing values, applied before resampling
4169-
4170-
.. version added:: 0.20.0
4171-
41724167
To learn more about the offset strings, please see `this link
41734168
<http://pandas.pydata.org/pandas-docs/stable/timeseries.html#offset-aliases>`__.
41744169
@@ -4273,10 +4268,6 @@ def resample(self, rule, how=None, axis=0, fill_method=None, closed=None,
42734268
from pandas.tseries.resample import (resample,
42744269
_maybe_process_deprecations)
42754270
axis = self._get_axis_number(axis)
4276-
4277-
if(fill_value is not None):
4278-
self = self.fillna(fill_value)
4279-
42804271
r = resample(self, freq=rule, label=label, closed=closed,
42814272
axis=axis, kind=kind, loffset=loffset,
42824273
convention=convention,

0 commit comments

Comments
 (0)