@@ -4047,10 +4047,12 @@ def between_time(self, start_time, end_time, include_start=True,
4047
4047
4048
4048
def resample (self , rule , how = None , axis = 0 , fill_method = None , closed = None ,
4049
4049
label = None , convention = 'start' , kind = None , loffset = None ,
4050
- limit = None , base = 0 ):
4050
+ limit = None , base = 0 , on = None , level = None ):
4051
4051
"""
4052
- Convenience method for frequency conversion and resampling of regular
4053
- time-series data.
4052
+ Convenience method for frequency conversion and resampling of time
4053
+ series. Object must have a datetime-like index (DatetimeIndex,
4054
+ PeriodIndex, or TimedeltaIndex), or pass datetime-like values
4055
+ to the on or level keyword.
4054
4056
4055
4057
Parameters
4056
4058
----------
@@ -4068,7 +4070,17 @@ def resample(self, rule, how=None, axis=0, fill_method=None, closed=None,
4068
4070
For frequencies that evenly subdivide 1 day, the "origin" of the
4069
4071
aggregated intervals. For example, for '5min' frequency, base could
4070
4072
range from 0 through 4. Defaults to 0
4073
+ on : string, optional
4074
+ For a DataFrame, column to use instead of index for resampling.
4075
+ Column must be datetime-like.
4071
4076
4077
+ .. versionadded:: 0.19.0
4078
+
4079
+ level : string or int, optional
4080
+ For a MultiIndex, level (name or number) to use for
4081
+ resampling. Level must be datetime-like.
4082
+
4083
+ .. versionadded:: 0.19.0
4072
4084
4073
4085
To learn more about the offset strings, please see `this link
4074
4086
<http://pandas.pydata.org/pandas-docs/stable/timeseries.html#offset-aliases>`__.
@@ -4173,12 +4185,11 @@ def resample(self, rule, how=None, axis=0, fill_method=None, closed=None,
4173
4185
"""
4174
4186
from pandas .tseries .resample import (resample ,
4175
4187
_maybe_process_deprecations )
4176
-
4177
4188
axis = self ._get_axis_number (axis )
4178
4189
r = resample (self , freq = rule , label = label , closed = closed ,
4179
4190
axis = axis , kind = kind , loffset = loffset ,
4180
4191
convention = convention ,
4181
- base = base )
4192
+ base = base , key = on , level = level )
4182
4193
return _maybe_process_deprecations (r ,
4183
4194
how = how ,
4184
4195
fill_method = fill_method ,
0 commit comments