Make IndexOpsMixin (and Index) generic

pandas-stubs/_libs/tslibs/timedeltas.pyi

@@ -11,14 +11,11 @@ import numpy as np
 import pandas as pd
 from pandas import (
     DatetimeIndex,
+    Index,
     PeriodIndex,
     Series,
     TimedeltaIndex,
 )
-from pandas.core.indexes.base import (
-    _FloatIndexType,
-    _IntIndexType,
-)
 from pandas.core.series import (
     TimedeltaSeries,
     TimestampSeries,
@@ -245,7 +242,7 @@ class Timedelta(timedelta):
     @overload
     def __mul__(self, other: Series[float]) -> TimedeltaSeries: ...
     @overload
-    def __mul__(self, other: _IntIndexType | _FloatIndexType) -> TimedeltaIndex: ...
+    def __mul__(self, other: Index[int] | Index[float]) -> TimedeltaIndex: ...
     @overload
     def __rmul__(self, other: float) -> Timedelta: ...
     @overload
@@ -254,8 +251,9 @@ class Timedelta(timedelta):
     def __rmul__(self, other: Series[int]) -> TimedeltaSeries: ...
     @overload
     def __rmul__(self, other: Series[float]) -> TimedeltaSeries: ...
+    # maybe related to https://github.com/python/mypy/issues/10755
     @overload
-    def __rmul__(self, other: _IntIndexType | _FloatIndexType) -> TimedeltaIndex: ...
+    def __rmul__(self, other: Index[int] | Index[float]) -> TimedeltaIndex: ...  # type: ignore[misc]
     # Override due to more types supported than dt.timedelta
     # error: Signature of "__floordiv__" incompatible with supertype "timedelta"
     @overload  # type: ignore[override]
@@ -271,9 +269,7 @@ class Timedelta(timedelta):
         self, other: npt.NDArray[np.timedelta64]
     ) -> npt.NDArray[np.int_]: ...
     @overload
-    def __floordiv__(
-        self, other: _IntIndexType | _FloatIndexType
-    ) -> TimedeltaIndex: ...
+    def __floordiv__(self, other: Index[int] | Index[float]) -> TimedeltaIndex: ...
     @overload
     def __floordiv__(self, other: Series[int]) -> TimedeltaSeries: ...
     @overload
@@ -306,7 +302,7 @@ class Timedelta(timedelta):
     @overload
     def __truediv__(self, other: Series[float]) -> TimedeltaSeries: ...
     @overload
-    def __truediv__(self, other: _IntIndexType | _FloatIndexType) -> TimedeltaIndex: ...
+    def __truediv__(self, other: Index[int] | Index[float]) -> TimedeltaIndex: ...
     def __rtruediv__(self, other: timedelta | Timedelta | NaTType) -> float: ...
     # Override due to more types supported than dt.timedelta
     @overload
@@ -338,7 +334,7 @@ class Timedelta(timedelta):
     @overload
     def __mod__(self, other: Series[int] | Series[float]) -> TimedeltaSeries: ...
     @overload
-    def __mod__(self, other: _IntIndexType | _FloatIndexType) -> TimedeltaIndex: ...
+    def __mod__(self, other: Index[int] | Index[float]) -> TimedeltaIndex: ...
     @overload
     def __mod__(
         self, other: npt.NDArray[np.integer] | npt.NDArray[np.floating]

pandas-stubs/_typing.pyi

@@ -511,19 +511,12 @@ S1 = TypeVar(
     | float
     | complex
     | Dtype
-    | Timestamp
-    | Timedelta
+    | datetime.datetime  # includes pd.Timestamp
+    | datetime.timedelta  # includes pd.Timedelta
     | Period
-    | Interval[int]
-    | Interval[float]
-    | Interval[Timestamp]
-    | Interval[Timedelta]
+    | Interval[int | float | Timestamp | Timedelta]
     | CategoricalDtype,
 )
-T1 = TypeVar(
-    "T1", str, int, np.int64, np.uint64, np.float64, float, np.dtype[np.generic]
-)
-T2 = TypeVar("T2", str, int)
 
 IndexingInt: TypeAlias = (
     int | np.int_ | np.integer | np.unsignedinteger | np.signedinteger | np.int8
@@ -601,14 +594,9 @@ ByT = TypeVar(
     | int
     | float
     | complex
-    | Timestamp
-    | Timedelta
     | Scalar
     | Period
-    | Interval[int]
-    | Interval[float]
-    | Interval[Timestamp]
-    | Interval[Timedelta]
+    | Interval[int | float | Timestamp | Timedelta]
     | tuple,
 )
 # Use a distinct SeriesByT when using groupby with Series of known dtype.
@@ -622,13 +610,10 @@ SeriesByT = TypeVar(
     | int
     | float
     | complex
-    | Timestamp
-    | Timedelta
+    | datetime.datetime
+    | datetime.timedelta
     | Period
-    | Interval[int]
-    | Interval[float]
-    | Interval[Timestamp]
-    | Interval[Timedelta],
+    | Interval[int | float | Timestamp | Timedelta],
 )
 GroupByObjectNonScalar: TypeAlias = (
     tuple

pandas-stubs/core/accessor.pyi

@@ -1,8 +1,5 @@
 from typing import Any
 
-class DirNamesMixin:
-    def __dir__(self): ...
-
 class PandasDelegate: ...
 
 def delegate_names(

pandas-stubs/core/arrays/categorical.pyi

@@ -12,10 +12,7 @@ import numpy as np
 from pandas import Series
 from pandas.core.accessor import PandasDelegate as PandasDelegate
 from pandas.core.arrays.base import ExtensionArray as ExtensionArray
-from pandas.core.base import (
-    NoNewAttributesMixin as NoNewAttributesMixin,
-    PandasObject as PandasObject,
-)
+from pandas.core.base import NoNewAttributesMixin as NoNewAttributesMixin
 from pandas.core.indexes.base import Index
 
 from pandas._typing import (
@@ -33,7 +30,7 @@ from pandas.core.dtypes.dtypes import CategoricalDtype as CategoricalDtype
 
 def contains(cat, key, container): ...
 
-class Categorical(ExtensionArray, PandasObject):
+class Categorical(ExtensionArray):
     __array_priority__: int = ...
     def __init__(
         self,
@@ -185,7 +182,7 @@ class Categorical(ExtensionArray, PandasObject):
     def repeat(self, repeats, axis=...): ...
     def isin(self, values): ...
 
-class CategoricalAccessor(PandasDelegate, PandasObject, NoNewAttributesMixin):
+class CategoricalAccessor(PandasDelegate, NoNewAttributesMixin):
     def __init__(self, data) -> None: ...
     @property
     def codes(self) -> Series[int]: ...

pandas-stubs/core/arrays/sparse/array.pyi

@@ -3,11 +3,10 @@ from pandas.core.arrays import (
     ExtensionArray,
     ExtensionOpsMixin,
 )
-from pandas.core.base import PandasObject
 
 from pandas._typing import TakeIndexer
 
-class SparseArray(PandasObject, ExtensionArray, ExtensionOpsMixin):
+class SparseArray(ExtensionArray, ExtensionOpsMixin):
     def __init__(
         self,
         data,

pandas-stubs/core/base.pyi

@@ -1,43 +1,42 @@
 from typing import (
     Generic,
+    Iterator,
     Literal,
 )
 
 import numpy as np
 from pandas import Index
-from pandas.core.accessor import DirNamesMixin
 from pandas.core.arraylike import OpsMixin
 from pandas.core.arrays import ExtensionArray
 from pandas.core.arrays.categorical import Categorical
+from typing_extensions import Self
 
 from pandas._typing import (
+    S1,
     AxisIndex,
     NaPosition,
     NDFrameT,
     Scalar,
     npt,
 )
 
-class PandasObject(DirNamesMixin):
-    def __sizeof__(self) -> int: ...
-
 class NoNewAttributesMixin:
     def __setattr__(self, key, value) -> None: ...
 
 class SelectionMixin(Generic[NDFrameT]):
     def ndim(self) -> int: ...
     def __getitem__(self, key): ...
 
-class IndexOpsMixin(OpsMixin):
+class IndexOpsMixin(OpsMixin, Generic[S1]):
     __array_priority__: int = ...
-    def transpose(self, *args, **kwargs) -> IndexOpsMixin: ...
+    def transpose(self, *args, **kwargs) -> Self: ...
     @property
-    def T(self) -> IndexOpsMixin: ...
+    def T(self) -> Self: ...
     @property
     def shape(self) -> tuple: ...
     @property
     def ndim(self) -> int: ...
-    def item(self): ...
+    def item(self) -> S1: ...
     @property
     def nbytes(self) -> int: ...
     @property
@@ -61,9 +60,9 @@ class IndexOpsMixin(OpsMixin):
     def argmin(
         self, axis: AxisIndex | None = ..., skipna: bool = ..., *args, **kwargs
     ) -> np.int64: ...
-    def tolist(self) -> list: ...
-    def to_list(self) -> list: ...
-    def __iter__(self): ...
+    def tolist(self) -> list[S1]: ...
+    def to_list(self) -> list[S1]: ...
+    def __iter__(self) -> Iterator[S1]: ...
     @property
     def hasnans(self) -> bool: ...
     def value_counts(
@@ -87,6 +86,4 @@ class IndexOpsMixin(OpsMixin):
     def searchsorted(
         self, value, side: Literal["left", "right"] = ..., sorter=...
     ) -> int | list[int]: ...
-    def drop_duplicates(
-        self, *, keep: NaPosition | Literal[False] = ...
-    ) -> IndexOpsMixin: ...
+    def drop_duplicates(self, *, keep: NaPosition | Literal[False] = ...) -> Self: ...

pandas-stubs/core/computation/ops.pyi

@@ -34,7 +34,6 @@ class Term:
     def ndim(self) -> int: ...
 
 class Constant(Term):
-    def __init__(self, value, env, side=..., encoding=...) -> None: ...
     @property
     def name(self): ...
 

pandas-stubs/core/computation/pytables.pyi

@@ -28,7 +28,7 @@ class Term(ops.Term):
     def value(self, new_value) -> None: ...
 
 class Constant(Term):
-    def __init__(self, value, env: PyTablesScope, side=..., encoding=...) -> None: ...
+    def __init__(self, name, env: PyTablesScope, side=..., encoding=...) -> None: ...
 
 class BinOp(ops.BinOp):
     op: str

pandas-stubs/core/generic.pyi

@@ -16,7 +16,6 @@ from typing import (
 
 import numpy as np
 from pandas import Index
-from pandas.core.base import PandasObject
 import pandas.core.indexing as indexing
 from pandas.core.series import Series
 import sqlalchemy.engine
@@ -54,7 +53,7 @@ from pandas.io.sql import SQLTable
 _bool = bool
 _str = str
 
-class NDFrame(PandasObject, indexing.IndexingMixin):
+class NDFrame(indexing.IndexingMixin):
     __hash__: ClassVar[None]  # type: ignore[assignment]
 
     def set_flags(

pandas-stubs/core/groupby/groupby.pyi

@@ -4,10 +4,7 @@ from collections.abc import (
 )
 
 import numpy as np
-from pandas.core.base import (
-    PandasObject,
-    SelectionMixin,
-)
+from pandas.core.base import SelectionMixin
 from pandas.core.frame import DataFrame
 from pandas.core.generic import NDFrame
 from pandas.core.groupby import ops
@@ -21,12 +18,12 @@ from pandas._typing import (
     npt,
 )
 
-class GroupByPlot(PandasObject):
+class GroupByPlot:
     def __init__(self, groupby) -> None: ...
     def __call__(self, *args, **kwargs): ...
     def __getattr__(self, name: str): ...
 
-class BaseGroupBy(PandasObject, SelectionMixin[NDFrameT]):
+class BaseGroupBy(SelectionMixin[NDFrameT]):
     level = ...
     as_index = ...
     keys = ...

pandas-stubs/core/indexes/accessors.pyi

@@ -20,12 +20,8 @@ from pandas.core.arrays import (
     DatetimeArray,
     PeriodArray,
 )
-from pandas.core.base import (
-    NoNewAttributesMixin,
-    PandasObject,
-)
+from pandas.core.base import NoNewAttributesMixin
 from pandas.core.frame import DataFrame
-from pandas.core.indexes.base import _IntIndexType
 from pandas.core.series import (
     PeriodSeries,
     Series,
@@ -40,10 +36,9 @@ from pandas._typing import (
     np_ndarray_bool,
 )
 
-class Properties(PandasDelegate, PandasObject, NoNewAttributesMixin):
-    def __init__(self, data: Series, orig) -> None: ...
+class Properties(PandasDelegate, NoNewAttributesMixin): ...
 
-_DTFieldOpsReturnType = TypeVar("_DTFieldOpsReturnType", Series[int], _IntIndexType)
+_DTFieldOpsReturnType = TypeVar("_DTFieldOpsReturnType", Series[int], Index[int])
 
 class _DayLikeFieldOps(Generic[_DTFieldOpsReturnType]):
     @property
@@ -302,7 +297,7 @@ class TimedeltaProperties(
 ): ...
 
 _PeriodDTReturnTypes = TypeVar("_PeriodDTReturnTypes", TimestampSeries, DatetimeIndex)
-_PeriodIntReturnTypes = TypeVar("_PeriodIntReturnTypes", Series[int], _IntIndexType)
+_PeriodIntReturnTypes = TypeVar("_PeriodIntReturnTypes", Series[int], Index[int])
 _PeriodStrReturnTypes = TypeVar("_PeriodStrReturnTypes", Series[str], Index)
 _PeriodDTAReturnTypes = TypeVar("_PeriodDTAReturnTypes", DatetimeArray, DatetimeIndex)
 _PeriodPAReturnTypes = TypeVar("_PeriodPAReturnTypes", PeriodArray, PeriodIndex)
@@ -335,8 +330,8 @@ class _PeriodProperties(
     ) -> _PeriodPAReturnTypes: ...
 
 class PeriodIndexFieldOps(
-    _DayLikeFieldOps[_IntIndexType],
-    _PeriodProperties[DatetimeIndex, _IntIndexType, Index, DatetimeIndex, PeriodIndex],
+    _DayLikeFieldOps[Index[int]],
+    _PeriodProperties[DatetimeIndex, Index[int], Index, DatetimeIndex, PeriodIndex],
 ): ...
 class PeriodProperties(
     Properties,
@@ -347,7 +342,6 @@ class PeriodProperties(
     _IsLeapYearProperty,
     _FreqProperty[BaseOffset],
 ): ...
-
 class CombinedDatetimelikeProperties(
     DatetimeProperties[
         Series[int],
@@ -362,9 +356,7 @@ class CombinedDatetimelikeProperties(
     ],
     _TimedeltaPropertiesNoRounding[Series[int], Series[float]],
     _PeriodProperties,
-):
-    def __new__(cls, data: Series): ...
-
+): ...
 class TimestampProperties(
     DatetimeProperties[
         Series[int],
@@ -382,7 +374,7 @@ class TimestampProperties(
 class DatetimeIndexProperties(
     Properties,
     _DatetimeNoTZProperties[
-        _IntIndexType,
+        Index[int],
         np_ndarray_bool,
         DatetimeIndex,
         np.ndarray,