Skip to content

Commit dbf71f9

Browse files
committed
BUG: fix broken time_rule usage in legacy DateRange, close #1036
1 parent fde3703 commit dbf71f9

File tree

2 files changed

+24
-2
lines changed

2 files changed

+24
-2
lines changed

pandas/core/daterange.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ def __new__(cls, start=None, end=None, periods=None,
2121

2222
# use old mapping
2323
if time_rule is not None:
24-
offset = datetools._offsetMap[time_rule]
24+
offset = datetools._offset_map[time_rule]
2525
elif 'timeRule' in kwds and kwds['timeRule'] is not None:
26-
offset = datetools._offsetMap[kwds['timeRule']]
26+
offset = datetools._offset_map[kwds['timeRule']]
2727

2828
return DatetimeIndex(start=start, end=end,
2929
periods=periods, offset=offset,

pandas/tests/test_timeseries.py

+22
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# pylint: disable-msg=E1101,W0612
22

33
from datetime import datetime
4+
import sys
45
import unittest
56

67
import nose
@@ -12,6 +13,8 @@
1213

1314
from pandas import DatetimeIndex
1415

16+
from pandas.core.daterange import DateRange
17+
1518
from pandas.util.testing import assert_series_equal, assert_almost_equal
1619
import pandas.util.testing as tm
1720

@@ -389,6 +392,25 @@ def test_setops_conversion_fail(self):
389392
self.assert_(result.equals(expected))
390393

391394

395+
class TestDateRangeCompat(unittest.TestCase):
396+
397+
def setUp(self):
398+
from StringIO import StringIO
399+
# suppress deprecation warnings
400+
sys.stderr = StringIO()
401+
402+
def test_time_rule(self):
403+
result = DateRange('1/1/2000', '1/30/2000', time_rule='WEEKDAY')
404+
result2 = DateRange('1/1/2000', '1/30/2000', timeRule='WEEKDAY')
405+
expected = date_range('1/1/2000', '1/30/2000', freq='B')
406+
407+
self.assert_(result.equals(expected))
408+
self.assert_(result2.equals(expected))
409+
410+
def tearDown(self):
411+
sys.stderr = sys.__stderr__
412+
413+
392414
class TestDatetime64(unittest.TestCase):
393415

394416
def setUp(self):

0 commit comments

Comments
 (0)