Skip to content

Commit 9de7e33

Browse files
committed
BUG: fix lingering date_range over DST transition issue described in #1778
1 parent b17d4bb commit 9de7e33

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

pandas/tseries/index.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,8 @@ def _generate(cls, start, end, periods, name, offset,
298298
else:
299299
_normalized = _normalized and end.time() == _midnight
300300

301-
if hasattr(offset, 'delta'):
301+
302+
if hasattr(offset, 'delta') and offset != offsets.Day():
302303
if inferred_tz is None and tz is not None:
303304
# naive dates
304305
if start is not None and start.tz is None:

pandas/tseries/tests/test_timezones.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -426,11 +426,18 @@ def test_tzaware_datetime_to_index(self):
426426
self.assert_(index.tz.zone == 'US/Eastern')
427427

428428
def test_date_range_span_dst_transition(self):
429+
# #1778
430+
431+
# Standard -> Daylight Savings Time
429432
dr = date_range('03/06/2012 00:00', periods=200, freq='W-FRI',
430433
tz='US/Eastern')
431434

432435
self.assert_((dr.hour == 0).all())
433436

437+
dr = date_range('2012-11-02', periods=10, tz='US/Eastern')
438+
self.assert_((dr.hour == 0).all())
439+
440+
434441
class TestTimeZones(unittest.TestCase):
435442

436443
def setUp(self):

0 commit comments

Comments
 (0)