change deprecation of .asobject according to comments

Author: tp

doc/source/whatsnew/v0.22.0.txt

@@ -124,8 +124,7 @@ Deprecations
 
 - ``Series.from_array`` and ``SparseSeries.from_array`` are deprecated. Use the normal constructor ``Series(..)`` and ``SparseSeries(..)`` instead (:issue:`18213`).
 - ``DataFrame.as_matrix`` is deprecated. Use ``DataFrame.values`` instead (:issue:`18458`).
-- ``DatetimeIndex.asobject``, ``PeriodIndex.asobject`` and ``TimeDeltaIndex.asobject`` have been deprecated. Use '.astype(object)' instead (:issue:`18572`)
-- ``Series.asobject`` has been deprecated. Use '.astype(object).values' instead (:issue:`18572`)
+- ``Series.asobject``, ``DatetimeIndex.asobject``, ``PeriodIndex.asobject`` and ``TimeDeltaIndex.asobject`` have been deprecated. Use '.astype(object)' instead (:issue:`18572`)
 
 .. _whatsnew_0220.prior_deprecations:
 

pandas/_libs/algos_common_helper.pxi.in

@@ -552,8 +552,8 @@ cpdef ensure_object(object arr):
             return arr
         else:
             return arr.astype(np.object_)
-    elif hasattr(arr, '_asobject'):
-        return arr._asobject
+    elif hasattr(arr, '_box_values_as_index'):
+        return arr._box_values_as_index()
     else:
         return np.array(arr, dtype=np.object_)
 

pandas/core/accessor.py

@@ -10,7 +10,7 @@
 
 class DirNamesMixin(object):
     _accessors = frozenset([])
-    _deprecations = frozenset([])
+    _deprecations = frozenset(['asobject'])
 
     def _dir_deletions(self):
         """ delete unwanted __dir__ for this object """

pandas/core/indexes/datetimelike.py

@@ -242,6 +242,13 @@ def _box_values(self, values):
         """
         return lib.map_infer(values, self._box_func)
 
+    def _box_values_as_index(self):
+        """
+        return object Index which contains boxed values
+        """
+        from pandas.core.index import Index
+        return Index(self._box_values(self.asi8), name=self.name, dtype=object)
+
     def _format_with_header(self, header, **kwargs):
         return header + list(self._format_native_types(**kwargs))
 
@@ -422,14 +429,6 @@ def _isnan(self):
         """ return if each value is nan"""
         return (self.asi8 == iNaT)
 
-    @property
-    def _asobject(self):
-        """
-        return object Index which contains boxed values
-        """
-        from pandas.core.index import Index
-        return Index(self._box_values(self.asi8), name=self.name, dtype=object)
-
     @property
     def asobject(self):
         """DEPRECATED: Use ``astype(object)`` instead.

pandas/core/indexes/datetimes.py

@@ -907,7 +907,7 @@ def to_datetime(self, dayfirst=False):
     def astype(self, dtype, copy=True):
         dtype = pandas_dtype(dtype)
         if is_object_dtype(dtype):
-            return self._asobject
+            return self._box_values_as_index()
         elif is_integer_dtype(dtype):
             return Index(self.values.astype('i8', copy=copy), name=self.name,
                          dtype='i8')

pandas/core/indexes/period.py

@@ -506,7 +506,7 @@ def asof_locs(self, where, mask):
     def astype(self, dtype, copy=True, how='start'):
         dtype = pandas_dtype(dtype)
         if is_object_dtype(dtype):
-            return self._asobject
+            return self._box_values_as_index()
         elif is_integer_dtype(dtype):
             if copy:
                 return self._int64index.copy()

pandas/core/indexes/timedeltas.py

@@ -482,7 +482,7 @@ def astype(self, dtype, copy=True):
         dtype = np.dtype(dtype)
 
         if is_object_dtype(dtype):
-            return self._asobject
+            return self._box_values_as_index()
         elif is_timedelta64_ns_dtype(dtype):
             if copy is True:
                 return self.copy()

pandas/core/series.py

@@ -149,7 +149,8 @@ class Series(base.IndexOpsMixin, generic.NDFrame):
     _metadata = ['name']
     _accessors = frozenset(['dt', 'cat', 'str'])
     _deprecations = generic.NDFrame._deprecations | frozenset(
-        ['sortlevel', 'reshape', 'get_value', 'set_value', 'from_csv'])
+        ['asobject', 'sortlevel', 'reshape', 'get_value', 'set_value',
+         'from_csv'])
     _allow_index_ops = True
 
     def __init__(self, data=None, index=None, dtype=None, name=None,
@@ -449,13 +450,13 @@ def get_values(self):
 
     @property
     def asobject(self):
-        """DEPRECATED: Use ``astype(object).values`` instead.
+        """DEPRECATED: Use ``astype(object)`` instead.
 
         return object Series which contains boxed values
 
         *this is an internal non-public method*
         """
-        warnings.warn("'asobject' is deprecated. Use 'astype(object).values'"
+        warnings.warn("'asobject' is deprecated. Use 'astype(object)'"
                       " instead", FutureWarning, stacklevel=2)
         return self.astype(object).values
 

pandas/tests/indexes/datetimelike.py

@@ -78,15 +78,8 @@ def test_map_dictlike(self, mapper):
         tm.assert_index_equal(result, expected)
 
     def test_asobject_deprecated(self):
-        d = pd.date_range('2010-01-1', periods=3)
+        # GH18572
+        d = self.create_index()
         with tm.assert_produces_warning(FutureWarning):
             i = d.asobject
         assert isinstance(i, pd.Index)
-        p = pd.period_range('2010-01-1', periods=3)
-        with tm.assert_produces_warning(FutureWarning):
-            i = p.asobject
-        assert isinstance(i, pd.Index)
-        t = pd.timedelta_range('1 day', periods=3)
-        with tm.assert_produces_warning(FutureWarning):
-            i = t.asobject
-        assert isinstance(i, pd.Index)

pandas/tests/indexes/datetimes/test_ops.py

@@ -51,7 +51,7 @@ def test_ops_properties_basic(self):
         assert s.day == 10
         pytest.raises(AttributeError, lambda: s.weekday)
 
-    def test_astype(self):
+    def test_astype_object(self):
         idx = pd.date_range(start='2013-01-01', periods=4, freq='M',
                             name='idx')
         expected_list = [Timestamp('2013-01-31'),