properties

Author: cmp0xff

pandas-stubs/core/indexes/accessors.pyi

@@ -14,10 +14,10 @@ from typing import (
 
 import numpy as np
 from pandas.core.accessor import PandasDelegate
-from pandas.core.arrays.base import ExtensionArray
 from pandas.core.arrays.categorical import Categorical
 from pandas.core.arrays.datetimes import DatetimeArray
 from pandas.core.arrays.interval import IntervalArray
+from pandas.core.arrays.numpy_ import NumpyExtensionArray
 from pandas.core.arrays.period import PeriodArray
 from pandas.core.arrays.timedeltas import TimedeltaArray
 from pandas.core.base import (
@@ -49,8 +49,6 @@ from pandas._typing import (
     np_ndarray_bool,
 )
 
-from pandas.core.dtypes.dtypes import CategoricalDtype
-
 class Properties(PandasDelegate, NoNewAttributesMixin): ...
 
 _DTFieldOpsReturnType = TypeVar("_DTFieldOpsReturnType", bound=Series[int] | Index[int])
@@ -462,26 +460,31 @@ class DtDescriptor:
 class ArrayDescriptor:
     @overload
     def __get__(
-        self, instance: IndexOpsMixin[Never], owner: type[IndexOpsMixin]
-    ) -> ExtensionArray: ...
+        self, instance: IndexOpsMixin[Never, Never], owner: type[IndexOpsMixin]
+    ) -> NumpyExtensionArray: ...
     @overload
     def __get__(
-        self, instance: IndexOpsMixin[CategoricalDtype], owner: type[IndexOpsMixin]
+        self, instance: IndexOpsMixin[Never, Categorical], owner: type[IndexOpsMixin]
     ) -> Categorical: ...
     @overload
     def __get__(
-        self, instance: IndexOpsMixin[Interval], owner: type[IndexOpsMixin]
+        self,
+        instance: IndexOpsMixin[Interval, IntervalArray],
+        owner: type[IndexOpsMixin],
     ) -> IntervalArray: ...
     @overload
     def __get__(
-        self, instance: IndexOpsMixin[Timestamp], owner: type[IndexOpsMixin]
+        self,
+        instance: IndexOpsMixin[Timestamp, DatetimeArray],
+        owner: type[IndexOpsMixin],
     ) -> DatetimeArray: ...
     @overload
     def __get__(
-        self, instance: IndexOpsMixin[Timedelta], owner: type[IndexOpsMixin]
+        self,
+        instance: IndexOpsMixin[Timedelta, TimedeltaArray],
+        owner: type[IndexOpsMixin],
     ) -> TimedeltaArray: ...
-    # should be NumpyExtensionArray
     @overload
     def __get__(
-        self, instance: IndexOpsMixin, owner: type[IndexOpsMixin]
-    ) -> ExtensionArray: ...
+        self, instance: IndexOpsMixin[int, Never], owner: type[IndexOpsMixin]
+    ) -> NumpyExtensionArray: ...

pandas-stubs/core/indexes/interval.pyi

@@ -11,6 +11,7 @@ from typing import (
 
 import numpy as np
 import pandas as pd
+from pandas.core.arrays.interval import IntervalArray
 from pandas.core.indexes.base import Index
 from pandas.core.indexes.extension import ExtensionIndex
 
@@ -61,7 +62,7 @@ _TimestampLike: TypeAlias = pd.Timestamp | np.datetime64 | dt.datetime
 _TimedeltaLike: TypeAlias = pd.Timedelta | np.timedelta64 | dt.timedelta
 
 class IntervalIndex(
-    ExtensionIndex[IntervalT, IntervalIndex, np.object_], IntervalMixin
+    ExtensionIndex[IntervalT, IntervalArray, np.object_], IntervalMixin
 ):
     closed: IntervalClosedType
 

tests/indexes/test_indexes.py

@@ -12,10 +12,10 @@
 import numpy as np
 from numpy import typing as npt
 import pandas as pd
-from pandas.core.arrays.base import ExtensionArray
 from pandas.core.arrays.categorical import Categorical
 from pandas.core.arrays.datetimes import DatetimeArray
 from pandas.core.arrays.interval import IntervalArray
+from pandas.core.arrays.numpy_ import NumpyExtensionArray
 from pandas.core.arrays.timedeltas import TimedeltaArray
 from pandas.core.indexes.base import Index
 from pandas.core.indexes.category import CategoricalIndex
@@ -1476,7 +1476,11 @@ def test_array_property() -> None:
         TimedeltaArray,
         pd.Timedelta,
     )
-    check(assert_type(Index([1]).array, ExtensionArray), ExtensionArray, np.integer)
+    check(
+        assert_type(Index([1]).array, NumpyExtensionArray),
+        NumpyExtensionArray,
+        np.integer,
+    )
 
 
 def test_to_series() -> None:

tests/series/test_properties.py

@@ -2,9 +2,9 @@
 
 import numpy as np
 from pandas.core.arrays import DatetimeArray
-from pandas.core.arrays.base import ExtensionArray
 from pandas.core.arrays.categorical import Categorical
 from pandas.core.arrays.interval import IntervalArray
+from pandas.core.arrays.numpy_ import NumpyExtensionArray
 from pandas.core.arrays.timedeltas import TimedeltaArray
 from pandas.core.frame import DataFrame
 from pandas.core.indexes.accessors import (
@@ -77,7 +77,11 @@ def test_property_array() -> None:
         TimedeltaArray,
         Timedelta,
     )
-    check(assert_type(Series([1]).array, ExtensionArray), ExtensionArray, np.integer)
+    check(
+        assert_type(Series([1]).array, NumpyExtensionArray),
+        NumpyExtensionArray,
+        np.integer,
+    )
     # python/mypy#19952: mypy believes ExtensionArray and its subclasses have a
     # conflict and gives Any for s.array
-    check(assert_type(Series([1, "s"]).array, ExtensionArray), ExtensionArray)  # type: ignore[assert-type]
+    # check(assert_type(Series([1, "s"]).array, NumpyExtensionArray), NumpyExtensionArray)  # type: ignore[assert-type]