ENH: deprecate offset/timerule for freq, add future warnings · pandas-dev/pandas@3136390 (original) (raw)
`@@ -20,7 +20,7 @@ class TestDatetime64(unittest.TestCase):
`
20
20
``
21
21
`def setUp(self):
`
22
22
`dti = DatetimeIndex(start=datetime(2005,1,1),
`
23
``
`-
end=datetime(2005,1,10), offset='Min')
`
``
23
`+
end=datetime(2005,1,10), freq='Min')
`
24
24
``
25
25
`self.series = Series(rand(len(dti)), dti)
`
26
26
``
`@@ -215,7 +215,7 @@ def test_dayofmonthoffset(self):
`
215
215
`self.assert_(t.weekday() == day)
`
216
216
``
217
217
`def test_datetimeindex_accessors(self):
`
218
``
`-
dti = DatetimeIndex(offset='Q@JAN', start=datetime(1997,12,31),
`
``
218
`+
dti = DatetimeIndex(freq='Q@JAN', start=datetime(1997,12,31),
`
219
219
`periods=100)
`
220
220
``
221
221
`self.assertEquals(dti.year[0], 1998)
`
`@@ -249,9 +249,9 @@ def test_datetimeindex_accessors(self):
`
249
249
`self.assertEquals(len(dti.quarter), 100)
`
250
250
``
251
251
`def test_datetimeindex_diff(self):
`
252
``
`-
dti1 = DatetimeIndex(offset='Q@JAN', start=datetime(1997,12,31),
`
``
252
`+
dti1 = DatetimeIndex(freq='Q@JAN', start=datetime(1997,12,31),
`
253
253
`periods=100)
`
254
``
`-
dti2 = DatetimeIndex(offset='Q@JAN', start=datetime(1997,12,31),
`
``
254
`+
dti2 = DatetimeIndex(freq='Q@JAN', start=datetime(1997,12,31),
`
255
255
`periods=98)
`
256
256
`self.assert_( len(dti1.diff(dti2)) == 2)
`
257
257
``
`@@ -278,7 +278,7 @@ def test_datetimecache(self):
`
278
278
`lib.flush_tcache('W@TUE')
`
279
279
``
280
280
`def test_fancy_getitem(self):
`
281
``
`-
dti = DatetimeIndex(offset='WOM@1FRI', start=datetime(2005,1,1),
`
``
281
`+
dti = DatetimeIndex(freq='WOM@1FRI', start=datetime(2005,1,1),
`
282
282
`end=datetime(2010,1,1))
`
283
283
``
284
284
`s = Series(np.arange(len(dti)), index=dti)
`
`@@ -294,7 +294,7 @@ def test_fancy_getitem(self):
`
294
294
`s[datetime(2009,3,6):datetime(2009,6,5)])
`
295
295
``
296
296
`def test_fancy_setitem(self):
`
297
``
`-
dti = DatetimeIndex(offset='WOM@1FRI', start=datetime(2005,1,1),
`
``
297
`+
dti = DatetimeIndex(freq='WOM@1FRI', start=datetime(2005,1,1),
`
298
298
`end=datetime(2010,1,1))
`
299
299
``
300
300
`s = Series(np.arange(len(dti)), index=dti)
`
`@@ -307,7 +307,7 @@ def test_fancy_setitem(self):
`
307
307
``
308
308
`def test_custom_grouper(self):
`
309
309
``
310
``
`-
dti = DatetimeIndex(offset='Min', start=datetime(2005,1,1),
`
``
310
`+
dti = DatetimeIndex(freq='Min', start=datetime(2005,1,1),
`
311
311
`end=datetime(2005,1,10))
`
312
312
``
313
313
`data = np.array([1]*len(dti))
`
`@@ -346,8 +346,8 @@ def test_convert_basic(self):
`
346
346
`assert_series_equal(result, expect)
`
347
347
``
348
348
`# from daily
`
349
``
`-
dti = DatetimeIndex(start=datetime(2005,1,1),
`
350
``
`-
end=datetime(2005,1,10), offset='D')
`
``
349
`+
dti = DatetimeIndex(start=datetime(2005,1,1), end=datetime(2005,1,10),
`
``
350
`+
freq='D')
`
351
351
``
352
352
`s = Series(rand(len(dti)), dti)
`
353
353
``
`@@ -400,8 +400,8 @@ def test_convert_basic(self):
`
400
400
``
401
401
`def test_convert_upsample(self):
`
402
402
`# from daily
`
403
``
`-
dti = DatetimeIndex(start=datetime(2005,1,1),
`
404
``
`-
end=datetime(2005,1,10), offset='D')
`
``
403
`+
dti = DatetimeIndex(start=datetime(2005,1,1), end=datetime(2005,1,10),
`
``
404
`+
freq='D')
`
405
405
``
406
406
`s = Series(rand(len(dti)), dti)
`
407
407
``
`@@ -434,8 +434,8 @@ def test_convert_olhc(self):
`
434
434
`self.assertEquals(xs['close'], s[5])
`
435
435
``
436
436
`def test_convert_reconvert(self):
`
437
``
`-
dti = DatetimeIndex(start=datetime(2005,1,1),
`
438
``
`-
end=datetime(2005,1,10), offset='D')
`
``
437
`+
dti = DatetimeIndex(start=datetime(2005,1,1), end=datetime(2005,1,10),
`
``
438
`+
freq='D')
`
439
439
`s = Series(rand(len(dti)), dti)
`
440
440
`s = s.convert('B').convert('8H')
`
441
441
`self.assertEquals(len(s), 22)
`