Skip to content

Commit d8ee64e

Browse files
mroeschkeTomAugspurger
authored andcommitted
CLN: Resample time bin cruft (pandas-dev#24347)
1 parent 22863b7 commit d8ee64e

File tree

1 file changed

+3
-27
lines changed

1 file changed

+3
-27
lines changed

pandas/core/resample.py

+3-27
Original file line numberDiff line numberDiff line change
@@ -1393,7 +1393,6 @@ def _get_time_bins(self, ax):
13931393
self.freq,
13941394
closed=self.closed,
13951395
base=self.base)
1396-
tz = ax.tz
13971396
# GH #12037
13981397
# use first/last directly instead of call replace() on them
13991398
# because replace() will swallow the nanosecond part
@@ -1402,29 +1401,11 @@ def _get_time_bins(self, ax):
14021401
binner = labels = date_range(freq=self.freq,
14031402
start=first,
14041403
end=last,
1405-
tz=tz,
1404+
tz=ax.tz,
14061405
name=ax.name,
14071406
ambiguous='infer',
14081407
nonexistent='shift')
14091408

1410-
# GH 15549
1411-
# In edge case of tz-aware resapmling binner last index can be
1412-
# less than the last variable in data object, this happens because of
1413-
# DST time change
1414-
if len(binner) > 1 and binner[-1] < last:
1415-
extra_date_range = pd.date_range(binner[-1], last + self.freq,
1416-
freq=self.freq, tz=tz,
1417-
name=ax.name)
1418-
binner = labels = binner.append(extra_date_range[1:])
1419-
1420-
# a little hack
1421-
trimmed = False
1422-
if (len(binner) > 2 and binner[-2] == last and
1423-
self.closed == 'right'):
1424-
1425-
binner = binner[:-1]
1426-
trimmed = True
1427-
14281409
ax_values = ax.asi8
14291410
binner, bin_edges = self._adjust_bin_edges(binner, ax_values)
14301411

@@ -1436,13 +1417,8 @@ def _get_time_bins(self, ax):
14361417
labels = binner
14371418
if self.label == 'right':
14381419
labels = labels[1:]
1439-
elif not trimmed:
1440-
labels = labels[:-1]
1441-
else:
1442-
if self.label == 'right':
1443-
labels = labels[1:]
1444-
elif not trimmed:
1445-
labels = labels[:-1]
1420+
elif self.label == 'right':
1421+
labels = labels[1:]
14461422

14471423
if ax.hasnans:
14481424
binner = binner.insert(0, NaT)

0 commit comments

Comments
 (0)