Skip to content

Commit 1cfe934

Browse files
committed
DEPR: Deprecate DateRange [fix pandas-dev#6816]
1 parent fe9aa12 commit 1cfe934

File tree

8 files changed

+4
-79
lines changed

8 files changed

+4
-79
lines changed

pandas/core/api.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
from pandas.tseries.period import Period, PeriodIndex
2929

3030
# legacy
31-
from pandas.core.daterange import DateRange # deprecated
3231
from pandas.core.common import save, load # deprecated, remove in 0.13
3332
import pandas.core.datetools as datetools
3433

pandas/core/daterange.py

Lines changed: 0 additions & 48 deletions
This file was deleted.

pandas/core/index.py

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3888,26 +3888,6 @@ def _sanitize_and_check(indexes):
38883888
return indexes, 'array'
38893889

38903890

3891-
def _handle_legacy_indexes(indexes):
3892-
from pandas.core.daterange import DateRange
3893-
from pandas.tseries.index import DatetimeIndex
3894-
3895-
converted = []
3896-
for index in indexes:
3897-
if isinstance(index, DateRange):
3898-
if len(index) == 0:
3899-
kwds = dict(data=[], freq=index.offset, tz=index.tzinfo)
3900-
else:
3901-
kwds = dict(start=index[0], end=index[-1],
3902-
freq=index.offset, tz=index.tzinfo)
3903-
3904-
index = DatetimeIndex(**kwds)
3905-
3906-
converted.append(index)
3907-
3908-
return converted
3909-
3910-
39113891
def _get_consensus_names(indexes):
39123892

39133893
# find the non-none names, need to tupleify to make

pandas/core/internals.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@
1212
_NS_DTYPE, _TD_DTYPE, ABCSeries, is_list_like,
1313
ABCSparseSeries, _infer_dtype_from_scalar,
1414
_values_from_object, _is_null_datelike_scalar)
15-
from pandas.core.index import (Index, MultiIndex, _ensure_index,
16-
_handle_legacy_indexes)
15+
from pandas.core.index import Index, MultiIndex, _ensure_index
1716
from pandas.core.indexing import (_maybe_convert_indices, _length_of_indexer)
1817
import pandas.core.common as com
1918
from pandas.sparse.array import _maybe_to_sparse, SparseArray
@@ -2369,7 +2368,6 @@ def __setstate__(self, state):
23692368
ax_arrays, bvalues, bitems = state[:3]
23702369

23712370
self.axes = [_ensure_index(ax) for ax in ax_arrays]
2372-
self.axes = _handle_legacy_indexes(self.axes)
23732371

23742372
blocks = []
23752373
for values, items in zip(bvalues, bitems):

pandas/core/series.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
_ensure_object, SettingWithCopyError)
2727

2828
from pandas.core.index import (Index, MultiIndex, InvalidIndexError,
29-
_ensure_index, _handle_legacy_indexes)
29+
_ensure_index)
3030
from pandas.core.indexing import (
3131
_check_bool_indexer,
3232
_is_index_slice, _maybe_convert_indices)
@@ -426,7 +426,6 @@ def _unpickle_series_compat(self, state):
426426
index, name = own_state[0], None
427427
if len(own_state) > 1:
428428
name = own_state[1]
429-
index = _handle_legacy_indexes([index])[0]
430429

431430
# recreate
432431
self._data = SingleBlockManager(data, index, fastpath=True)

pandas/tseries/tests/test_timeseries.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
isnull, date_range, Timestamp, Period, DatetimeIndex,
1616
Int64Index, to_datetime, bdate_range, Float64Index)
1717

18-
from pandas.core.daterange import DateRange
1918
import pandas.core.datetools as datetools
2019
import pandas.tseries.offsets as offsets
2120
import pandas.tseries.tools as tools

pandas/tseries/tests/test_timeseries_legacy.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
isnull, date_range, Timestamp, DatetimeIndex,
1414
Int64Index, to_datetime, bdate_range)
1515

16-
from pandas.core.daterange import DateRange
1716
import pandas.core.datetools as datetools
1817
import pandas.tseries.offsets as offsets
1918
import pandas.tseries.frequencies as fmod
@@ -285,8 +284,8 @@ def test_inferTimeRule(self):
285284
self.assertRaises(Exception, inferTimeRule, index3)
286285

287286
def test_time_rule(self):
288-
result = DateRange('1/1/2000', '1/30/2000', time_rule='WEEKDAY')
289-
result2 = DateRange('1/1/2000', '1/30/2000', timeRule='WEEKDAY')
287+
result = DatetimeIndex('1/1/2000', '1/30/2000', time_rule='WEEKDAY')
288+
result2 = DatetimeIndex('1/1/2000', '1/30/2000', timeRule='WEEKDAY')
290289
expected = date_range('1/1/2000', '1/30/2000', freq='B')
291290

292291
self.assert_(result.equals(expected))

pandas/tseries/tests/test_timezones.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212

1313
from pandas import DatetimeIndex, Int64Index, to_datetime, NaT
1414

15-
from pandas.core.daterange import DateRange
1615
import pandas.core.datetools as datetools
1716
import pandas.tseries.offsets as offsets
1817
from pandas.tseries.index import bdate_range, date_range

0 commit comments

Comments
 (0)