fix: #718 ty

Author: cmp0xff

pandas-stubs/_libs/tslibs/timedeltas.pyi

@@ -297,7 +297,7 @@ class Timedelta(timedelta):
     @overload
     def __eq__(self, other: timedelta | Timedelta | np.timedelta64) -> bool: ...  # type: ignore[overload-overlap] # pyright: ignore[reportOverlappingOverload]
     @overload
-    def __eq__(self, other: Series[Timedelta] | Series[pd.Timedelta]) -> Series[bool]: ...  # type: ignore[overload-overlap]
+    def __eq__(self, other: Series[Timedelta]) -> Series[bool]: ...  # type: ignore[overload-overlap]
     @overload
     def __eq__(  # type: ignore[overload-overlap]
         self, other: TimedeltaIndex | npt.NDArray[np.timedelta64]

pandas-stubs/core/series.pyi

@@ -187,7 +187,7 @@ _vector_timedelta: TypeAlias = (
     Sequence[timedelta] | Sequence[Timedelta] | TimedeltaIndex
 )
 _nonseries_timedelta: TypeAlias = _scalar_timedelta | _vector_timedelta
-_all_int: TypeAlias = int | np_ndarray_anyint | Series[int] | Sequence[int]
+_nonseries_int: TypeAlias = int | np_ndarray_anyint | Sequence[int]
 
 _T_INT = TypeVar("_T_INT", bound=int)
 _T_STAMP_AND_DELTA = TypeVar("_T_STAMP_AND_DELTA", bound=Timestamp | Timedelta)
@@ -819,7 +819,7 @@ class Series(IndexOpsMixin[S1], NDFrame):
     @overload
     def diff(self: Series[_str], periods: int = ...) -> Never: ...
     @overload
-    def diff(self: Series[Timestamp] | Series[Timedelta], periods: int = ...) -> Series[Timedelta]: ...  # type: ignore[overload-overlap]
+    def diff(self: Series[_T_STAMP_AND_DELTA], periods: int = ...) -> Series[Timedelta]: ...  # type: ignore[overload-overlap]
     @overload
     def diff(self, periods: int = ...) -> Series[float]: ...
     def autocorr(self, lag: int = ...) -> float: ...
@@ -1596,7 +1596,9 @@ class Series(IndexOpsMixin[S1], NDFrame):
     # just failed to generate these so I couldn't match
     # them up.
     @overload
-    def __add__(self: Series[_T_INT], other: _all_int) -> Series[_T_INT]: ...
+    def __add__(
+        self: Series[_T_INT], other: _nonseries_int | Series[int]
+    ) -> Series[_T_INT]: ...
     @overload
     def __add__(
         self: Series[_T_STAMP_AND_DELTA],
@@ -1622,7 +1624,7 @@ class Series(IndexOpsMixin[S1], NDFrame):
         self, other: bool | list[int] | MaskType
     ) -> Series[bool]: ...
     @overload
-    def __and__(self, other: _all_int) -> Series[int]: ...
+    def __and__(self, other: _nonseries_int | Series[int]) -> Series[int]: ...
     # def __array__(self, dtype: Optional[_bool] = ...) -> _np_ndarray
     def __div__(self, other: num | _ListLike | Series[S1]) -> Series[S1]: ...
     def __eq__(self, other: object) -> Series[_bool]: ...  # type: ignore[override] # pyright: ignore[reportIncompatibleMethodOverride]
@@ -1650,7 +1652,9 @@ class Series(IndexOpsMixin[S1], NDFrame):
         self, other: S1 | _ListLike | Series[S1] | datetime | timedelta | date
     ) -> Series[_bool]: ...
     @overload
-    def __mul__(self: Series[_T_INT], other: _all_int) -> Series[_T_INT]: ...
+    def __mul__(
+        self: Series[_T_INT], other: _nonseries_int | Series[int]
+    ) -> Series[_T_INT]: ...
     @overload
     def __mul__(
         self: Series[_T_STAMP_AND_DELTA],
@@ -1678,7 +1682,7 @@ class Series(IndexOpsMixin[S1], NDFrame):
         self, other: bool | list[int] | MaskType
     ) -> Series[bool]: ...
     @overload
-    def __or__(self, other: _all_int) -> Series[int]: ...
+    def __or__(self, other: _nonseries_int | Series[int]) -> Series[int]: ...
     @overload
     def __radd__(
         self: Series[Timestamp], other: _nonseries_timedelta | Series[Timedelta]
@@ -1697,7 +1701,7 @@ class Series(IndexOpsMixin[S1], NDFrame):
         self, other: bool | MaskType | list[int]
     ) -> Series[bool]: ...
     @overload
-    def __rand__(self, other: _all_int) -> Series[int]: ...
+    def __rand__(self, other: _nonseries_int | Series[int]) -> Series[int]: ...
     def __rdiv__(self, other: num | _ListLike | Series[S1]) -> Series[S1]: ...
     def __rdivmod__(self, other: num | _ListLike | Series[S1]) -> Series[S1]: ...  # type: ignore[override] # pyright: ignore[reportIncompatibleMethodOverride]
     @overload
@@ -1721,7 +1725,7 @@ class Series(IndexOpsMixin[S1], NDFrame):
         self, other: bool | MaskType | list[int]
     ) -> Series[bool]: ...
     @overload
-    def __ror__(self, other: _all_int) -> Series[int]: ...
+    def __ror__(self, other: _nonseries_int | Series[int]) -> Series[int]: ...
     def __rsub__(self, other: num | _ListLike | Series[S1]) -> Series: ...
     @overload
     def __rtruediv__(
@@ -1735,9 +1739,11 @@ class Series(IndexOpsMixin[S1], NDFrame):
         self, other: bool | MaskType | list[int]
     ) -> Series[bool]: ...
     @overload
-    def __rxor__(self, other: _all_int) -> Series[int]: ...
+    def __rxor__(self, other: _nonseries_int | Series[int]) -> Series[int]: ...
     @overload
-    def __sub__(self: Series[_T_INT], other: _all_int) -> Series[_T_INT]: ...
+    def __sub__(
+        self: Series[_T_INT], other: _nonseries_int | Series[int]
+    ) -> Series[_T_INT]: ...
     @overload
     def __sub__(  # type: ignore[overload-overlap]
         self: Series[Timestamp], other: _nonseries_timedelta | Series[Timedelta]
@@ -1769,7 +1775,7 @@ class Series(IndexOpsMixin[S1], NDFrame):
         self, other: bool | MaskType | list[int]
     ) -> Series[bool]: ...
     @overload
-    def __xor__(self, other: _all_int) -> Series[int]: ...
+    def __xor__(self, other: _nonseries_int | Series[int]) -> Series[int]: ...
     def __invert__(self) -> Series[bool]: ...
     # properties
     # @property
@@ -1831,7 +1837,7 @@ class Series(IndexOpsMixin[S1], NDFrame):
     ) -> Never: ...
     @overload
     def cumprod(
-        self: Series[Timestamp] | Series[Timedelta],
+        self: Series[_T_STAMP_AND_DELTA],
         axis: AxisIndex = ...,
         skipna: _bool = ...,
         *args: Any,
@@ -2163,7 +2169,7 @@ class Series(IndexOpsMixin[S1], NDFrame):
     ) -> Scalar: ...
     @overload
     def std(
-        self: Series[Timestamp] | Series[Timedelta],
+        self: Series[_T_STAMP_AND_DELTA],
         axis: AxisIndex | None = ...,
         skipna: _bool | None = ...,
         level: None = ...,