Skip to content

Commit 91ff143

Browse files
committed
ENH: Added functionality in resample to resolve pandas-dev#10530
1 parent bbec57d commit 91ff143

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

pandas/tseries/resample.py

+9-2
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ def __init__(self, freq='Min', closed=None, label=None, how='mean',
6868
self.fill_method = fill_method
6969
self.limit = limit
7070
self.base = base
71-
7271
# always sort time groupers
7372
kwargs['sort'] = True
7473

@@ -160,7 +159,7 @@ def _get_time_bins(self, ax):
160159
first, last = _get_range_edges(first, last, self.freq, closed=self.closed,
161160
base=self.base)
162161
tz = ax.tz
163-
binner = labels = DatetimeIndex(freq=self.freq,
162+
einner = labels = DatetimeIndex(freq=self.freq,
164163
start=first.replace(tzinfo=None),
165164
end=last.replace(tzinfo=None),
166165
tz=tz,
@@ -324,6 +323,14 @@ def _resample_timestamps(self, kind=None):
324323

325324
result.index = result.index + loffset
326325

326+
min_base = (type(self.freq))(0)
327+
base_freq = (type(self.freq))(self.base)
328+
if (base_freq < min_base) or (base_freq > self.freq):
329+
raise Exception("Value of self.base must be between 0 and {freq}, "
330+
"got {base} instead".format(freq=self.freq.n, base=self.base))
331+
332+
result.index = result.index.shift(self.base, type(self.freq)(1))
333+
327334
return result
328335

329336
def _resample_periods(self):

0 commit comments

Comments
 (0)