CLN: Make Series._values match Index._values

pandas/core/apply.py

@@ -280,6 +280,7 @@ def apply_standard(self):
             and not self.dtypes.apply(is_extension_array_dtype).any()
             # Disallow complex_internals since libreduction shortcut
             #  cannot handle MultiIndex
+            and not self.dtypes.apply(lambda x: x.kind in ["m", "M"]).any()
             and not isinstance(self.agg_axis, ABCMultiIndex)
         ):
 

pandas/core/base.py

@@ -743,7 +743,16 @@ def array(self) -> ExtensionArray:
         [a, b, a]
         Categories (2, object): [a, b]
         """
-        raise AbstractMethodError(self)
+        # As a mixin, we depend on the mixing class having _values.
+        # Special mixin syntax may be developed in the future:
+        # https://github.com/python/typing/issues/246
+        result = self._values  # type: ignore
+        if isinstance(result, np.ndarray):
+            from pandas.core.arrays.numpy_ import PandasArray
+
+            result = PandasArray(result)
+
+        return result
 
     def to_numpy(self, dtype=None, copy=False, na_value=lib.no_default, **kwargs):
         """
@@ -1249,6 +1258,9 @@ def unique(self):
         if hasattr(values, "unique"):
 
             result = values.unique()
+            if self.dtype.kind in ["m", "M"]:
+                if getattr(self.dtype, "tz", None) is None:
+                    result = np.asarray(result)
         else:
             result = unique1d(values)
 

pandas/core/construction.py

@@ -377,7 +377,10 @@ def extract_array(obj, extract_numpy: bool = False):
     array([1, 2, 3])
     """
     if isinstance(obj, (ABCIndexClass, ABCSeries)):
-        obj = obj.array
+        arr = obj._values
+        if not extract_numpy and isinstance(arr, np.ndarray):
+            return obj.array
+        return arr
 
     if extract_numpy and isinstance(obj, ABCPandasArray):
         obj = obj.to_numpy()

pandas/core/internals/blocks.py

@@ -12,6 +12,7 @@
 import pandas._libs.internals as libinternals
 from pandas._libs.tslibs import Timedelta, conversion
 from pandas._libs.tslibs.timezones import tz_compare
+from pandas.util._decorators import cache_readonly
 from pandas.util._validators import validate_bool_kwarg
 
 from pandas.core.dtypes.cast import (
@@ -66,14 +67,7 @@
 )
 
 import pandas.core.algorithms as algos
-from pandas.core.arrays import (
-    Categorical,
-    DatetimeArray,
-    ExtensionArray,
-    PandasArray,
-    PandasDtype,
-    TimedeltaArray,
-)
+from pandas.core.arrays import Categorical, DatetimeArray, PandasDtype, TimedeltaArray
 from pandas.core.base import PandasObject
 import pandas.core.common as com
 from pandas.core.construction import extract_array
@@ -216,12 +210,6 @@ def internal_values(self):
         """
         return self.values
 
-    def array_values(self) -> ExtensionArray:
-        """
-        The array that Series.array returns. Always an ExtensionArray.
-        """
-        return PandasArray(self.values)
-
     def get_values(self, dtype=None):
         """
         return an internal format, currently just the ndarray
@@ -1794,9 +1782,6 @@ def get_values(self, dtype=None):
             values = values.reshape((1,) + values.shape)
         return values
 
-    def array_values(self) -> ExtensionArray:
-        return self.values
-
     def to_dense(self):
         return np.asarray(self.values)
 
@@ -2138,6 +2123,13 @@ def get_values(self, dtype=None):
             return result.reshape(self.values.shape)
         return self.values
 
+    def internal_values(self):
+        return self._ea_values
+
+    @cache_readonly
+    def _ea_values(self):
+        return self._holder(self.values)
+
 
 class DatetimeBlock(DatetimeLikeBlockMixin, Block):
     __slots__ = ()
@@ -2174,6 +2166,7 @@ def _maybe_coerce_values(self, values):
             values = values._data
 
         assert isinstance(values, np.ndarray), type(values)
+        assert values.dtype == _NS_DTYPE, values.dtype
         return values
 
     def astype(self, dtype, copy: bool = False, errors: str = "raise"):
@@ -2260,9 +2253,6 @@ def set(self, locs, values):
     def external_values(self):
         return np.asarray(self.values.astype("datetime64[ns]", copy=False))
 
-    def array_values(self) -> ExtensionArray:
-        return DatetimeArray._simple_new(self.values)
-
 
 class DatetimeTZBlock(ExtensionBlock, DatetimeBlock):
     """ implement a datetime64 block with a tz attribute """
@@ -2271,6 +2261,7 @@ class DatetimeTZBlock(ExtensionBlock, DatetimeBlock):
     is_datetimetz = True
     is_extension = True
 
+    internal_values = Block.internal_values
     _can_hold_element = DatetimeBlock._can_hold_element
     to_native_types = DatetimeBlock.to_native_types
     fill_value = np.datetime64("NaT", "ns")
@@ -2520,9 +2511,6 @@ def to_native_types(self, slicer=None, na_rep=None, quoting=None, **kwargs):
     def external_values(self):
         return np.asarray(self.values.astype("timedelta64[ns]", copy=False))
 
-    def array_values(self) -> ExtensionArray:
-        return TimedeltaArray._simple_new(self.values)
-
 
 class BoolBlock(NumericBlock):
     __slots__ = ()

pandas/core/series.py

@@ -526,11 +526,6 @@ def _values(self):
         """
         return self._data.internal_values()
 
-    @Appender(base.IndexOpsMixin.array.__doc__)  # type: ignore
-    @property
-    def array(self) -> ExtensionArray:
-        return self._data._block.array_values()
-
     def _internal_get_values(self):
         """
         Same as values (but handles sparseness conversions); is a view.

pandas/tests/indexes/datetimes/test_tools.py

@@ -1583,7 +1583,7 @@ def test_string_na_nat_conversion(self, cache):
         for i in range(5):
             x = series[i]
             if isna(x):
-                expected[i] = iNaT
+                expected[i] = pd.NaT
             else:
                 expected[i] = to_datetime(x, cache=cache)
 

pandas/tests/reductions/test_reductions.py

@@ -316,7 +316,12 @@ def test_invalid_td64_reductions(self, opname):
         )
         td = s.diff()
 
-        msg = "reduction operation '{op}' not allowed for this dtype"
+        msg = "|".join(
+            [
+                "reduction operation '{op}' not allowed for this dtype",
+                r"cannot perform {op} with type timedelta64\[ns\]",
+            ]
+        )
         msg = msg.format(op=opname)
 
         with pytest.raises(TypeError, match=msg):
@@ -648,7 +653,13 @@ def test_ops_consistency_on_empty(self, method):
         # timedelta64[ns]
         tdser = Series([], dtype="m8[ns]")
         if method == "var":
-            with pytest.raises(TypeError, match="operation 'var' not allowed"):
+            msg = "|".join(
+                [
+                    "operation 'var' not allowed",
+                    r"cannot perform var with type timedelta64\[ns\]",
+                ]
+            )
+            with pytest.raises(TypeError, match=msg):
                 getattr(tdser, method)()
         else:
             result = getattr(tdser, method)()