wip

Author: cmp0xff

pandas-stubs/core/indexes/base.pyi

@@ -475,19 +475,15 @@ class Index(IndexOpsMixin[S1, A1_co, GenericT_co], ElementOpsMixin[S1]):
     @overload
     def where(
         self,
-        cond: (
-            Sequence[bool] | np_ndarray_bool | BooleanArray | IndexOpsMixin[bool, A1_co]
-        ),
-        other: S1 | Series[S1, A1_co] | Self,
+        cond: Sequence[bool] | np_ndarray_bool | BooleanArray | IndexOpsMixin[bool],
+        other: S1 | Series[S1] | Self,
     ) -> Self: ...
     @overload
     def where(
         self,
-        cond: (
-            Sequence[bool] | np_ndarray_bool | BooleanArray | IndexOpsMixin[bool, A1_co]
-        ),
+        cond: Sequence[bool] | np_ndarray_bool | BooleanArray | IndexOpsMixin[bool],
         other: Scalar | AnyArrayLike | None = None,
-    ) -> Index[Any, A1_co]: ...
+    ) -> Index: ...
     def __contains__(self, key: Hashable) -> bool: ...
     @final
     def __setitem__(self, key, value) -> None: ...

pandas-stubs/core/indexes/datetimes.pyi

@@ -20,13 +20,13 @@ from pandas import (
     TimedeltaIndex,
     Timestamp,
 )
+from pandas.core.arrays.datetimes import DatetimeArray
 from pandas.core.indexes.accessors import DatetimeIndexProperties
 from pandas.core.indexes.datetimelike import DatetimeTimedeltaMixin
 from pandas.core.series import Series
 from typing_extensions import Self
 
 from pandas._typing import (
-    A1_co,
     AxesData,
     DateAndDatetimeLike,
     Dtype,
@@ -44,7 +44,8 @@ from pandas.core.dtypes.dtypes import DatetimeTZDtype
 from pandas.tseries.offsets import BaseOffset
 
 class DatetimeIndex(
-    DatetimeTimedeltaMixin[Timestamp, A1_co, np.datetime64], DatetimeIndexProperties
+    DatetimeTimedeltaMixin[Timestamp, DatetimeArray, np.datetime64],
+    DatetimeIndexProperties,
 ):
     def __new__(
         cls,

pandas-stubs/core/indexes/interval.pyi

@@ -25,6 +25,7 @@ from pandas._typing import (
     Frequency,
     IntervalClosedType,
     IntervalT,
+    Just,
     Label,
     MaskType,
     np_1darray,
@@ -44,7 +45,7 @@ _EdgesInt: TypeAlias = (
     | Index[int]
 )
 _EdgesFloat: TypeAlias = (
-    Sequence[float] | npt.NDArray[np.float64] | pd.Series[float] | Index[float]
+    Sequence[Just[float]] | npt.NDArray[np.float64] | pd.Series[float] | Index[float]
 )
 _EdgesTimestamp: TypeAlias = (
     Sequence[DatetimeLike]
@@ -77,7 +78,7 @@ class IntervalIndex(
     ) -> IntervalIndex[IntervalT]: ...
     @overload
     @classmethod
-    def from_breaks(  # pyright: ignore[reportOverlappingOverload]
+    def from_breaks(
         cls,
         breaks: _EdgesInt,
         closed: IntervalClosedType = ...,
@@ -117,7 +118,7 @@ class IntervalIndex(
     ) -> IntervalIndex[Interval[pd.Timedelta]]: ...
     @overload
     @classmethod
-    def from_arrays(  # pyright: ignore[reportOverlappingOverload]
+    def from_arrays(
         cls,
         left: _EdgesInt,
         right: _EdgesInt,

pandas-stubs/core/indexes/timedeltas.pyi

@@ -11,6 +11,7 @@ from typing import (
 )
 
 import numpy as np
+from pandas.core.arrays.timedeltas import TimedeltaArray
 from pandas.core.indexes.accessors import TimedeltaIndexProperties
 from pandas.core.indexes.base import Index
 from pandas.core.indexes.datetimelike import DatetimeTimedeltaMixin
@@ -26,7 +27,6 @@ from pandas._libs import Timedelta
 from pandas._libs.tslibs import BaseOffset
 from pandas._libs.tslibs.period import Period
 from pandas._typing import (
-    A1_co,
     AxesData,
     Frequency,
     Just,
@@ -53,7 +53,8 @@ _DT_FACTOR: TypeAlias = dt.timedelta | np.timedelta64 | Timedelta
 _DT_FACTOR_SEQ: TypeAlias = _DT_FACTOR | Sequence[_DT_FACTOR] | np_ndarray_td
 
 class TimedeltaIndex(
-    DatetimeTimedeltaMixin[Timedelta, A1_co, np.timedelta64], TimedeltaIndexProperties
+    DatetimeTimedeltaMixin[Timedelta, TimedeltaArray, np.timedelta64],
+    TimedeltaIndexProperties,
 ):
     def __new__(
         cls,

tests/indexes/test_indexes.py

@@ -1555,7 +1555,7 @@ def test_index_where() -> None:
     val_idx = idx.where(mask, idx)
     check(assert_type(val_idx, "pd.Index[int]"), pd.Index, int)
 
-    val_sr = idx.where(mask, (idx).to_series())
+    val_sr = idx.where(mask, idx.to_series())
     check(assert_type(val_sr, "pd.Index[int]"), pd.Index, int)