Enable Y019, Y037, and Y041 (#540)

* Enable Y037

* and Y019

* and Y041

Author: twoertwein

.pre-commit-config.yaml

@@ -30,7 +30,7 @@ repos:
         - flake8-pyi==23.1.2
         types: [pyi]
         args: [
-          --ignore=E301 E302 E305 E402 E501 E701 E704 F401 F811 W503 Y019 Y037 Y041 Y042,
+          --ignore=E301 E302 E305 E402 E501 E701 E704 F401 F811 W503 Y042,
           # TypeVars in private files are already private
           --per-file-ignores=_*.pyi:Y001
         ]

pandas-stubs/_libs/interval.pyi

@@ -148,7 +148,7 @@ class Interval(IntervalMixin, Generic[_OrderableT]):
     @overload
     def __rmul__(self: Interval[Timedelta], y: float) -> Interval[Timedelta]: ...
     @overload
-    def __truediv__(self: Interval[int], y: int | float) -> Interval[float]: ...
+    def __truediv__(self: Interval[int], y: float) -> Interval[float]: ...
     @overload
     def __truediv__(self: Interval[float], y: float) -> Interval[float]: ...
     @overload

pandas-stubs/_libs/tslibs/nattype.pyi

@@ -3,7 +3,6 @@ from datetime import (
     timedelta,
     tzinfo as _tzinfo,
 )
-from typing import Union
 
 import numpy as np
 from typing_extensions import TypeAlias
@@ -14,9 +13,9 @@ NaT: NaTType
 iNaT: int
 nat_strings: set[str]
 
-_NaTComparisonTypes: TypeAlias = Union[
-    datetime, timedelta, Period, np.datetime64, np.timedelta64
-]
+_NaTComparisonTypes: TypeAlias = (
+    datetime | timedelta | Period | np.datetime64 | np.timedelta64
+)
 
 class _NatComparison:
     def __call__(self, other: _NaTComparisonTypes) -> bool: ...

pandas-stubs/_libs/tslibs/offsets.pyi

@@ -14,14 +14,14 @@ from typing import (
 
 import numpy as np
 from pandas.core.indexes.datetimes import DatetimeIndex
+from typing_extensions import Self
 
 from pandas._typing import npt
 
 from pandas.tseries.holiday import AbstractHolidayCalendar
 
 from .timedeltas import Timedelta
 
-_BaseOffsetT = TypeVar("_BaseOffsetT", bound=BaseOffset)
 _DatetimeT = TypeVar("_DatetimeT", bound=date)
 _TimedeltaT = TypeVar("_TimedeltaT", bound=timedelta)
 
@@ -42,24 +42,24 @@ class BaseOffset:
     @overload
     def __add__(self, other: npt.NDArray[np.object_]) -> npt.NDArray[np.object_]: ...
     @overload
-    def __add__(self: _BaseOffsetT, other: BaseOffset) -> _BaseOffsetT: ...
+    def __add__(self, other: BaseOffset) -> Self: ...
     @overload
     def __add__(self, other: _DatetimeT) -> _DatetimeT: ...
     @overload
     def __add__(self, other: _TimedeltaT) -> _TimedeltaT: ...
     @overload
     def __radd__(self, other: npt.NDArray[np.object_]) -> npt.NDArray[np.object_]: ...
     @overload
-    def __radd__(self: _BaseOffsetT, other: BaseOffset) -> _BaseOffsetT: ...
+    def __radd__(self, other: BaseOffset) -> Self: ...
     @overload
     def __radd__(self, other: _DatetimeT) -> _DatetimeT: ...
     @overload
     def __radd__(self, other: _TimedeltaT) -> _TimedeltaT: ...
-    def __sub__(self: _BaseOffsetT, other: BaseOffset) -> _BaseOffsetT: ...
+    def __sub__(self, other: BaseOffset) -> Self: ...
     @overload
     def __rsub__(self, other: npt.NDArray[np.object_]) -> npt.NDArray[np.object_]: ...
     @overload
-    def __rsub__(self: _BaseOffsetT, other: BaseOffset) -> _BaseOffsetT: ...
+    def __rsub__(self, other: BaseOffset) -> Self: ...
     @overload
     def __rsub__(self, other: _DatetimeT) -> _DatetimeT: ...
     @overload
@@ -68,13 +68,13 @@ class BaseOffset:
     @overload
     def __mul__(self, other: np.ndarray) -> np.ndarray: ...
     @overload
-    def __mul__(self: _BaseOffsetT, other: int) -> _BaseOffsetT: ...
+    def __mul__(self, other: int) -> Self: ...
     @overload
     def __rmul__(self, other: np.ndarray) -> np.ndarray: ...
     @overload
-    def __rmul__(self: _BaseOffsetT, other: int) -> _BaseOffsetT: ...
-    def __neg__(self: _BaseOffsetT) -> _BaseOffsetT: ...
-    def copy(self: _BaseOffsetT) -> _BaseOffsetT: ...
+    def __rmul__(self, other: int) -> Self: ...
+    def __neg__(self) -> Self: ...
+    def copy(self) -> Self: ...
     @property
     def name(self) -> str: ...
     @property

pandas-stubs/_libs/tslibs/period.pyi

@@ -1,7 +1,6 @@
 import datetime
 from typing import (
     Literal,
-    Union,
     overload,
 )
 
@@ -29,9 +28,9 @@ class IncompatibleFrequency(ValueError): ...
 
 from pandas._libs.tslibs.offsets import BaseOffset
 
-_PeriodAddSub: TypeAlias = Union[
-    Timedelta, datetime.timedelta, np.timedelta64, np.int64, int, BaseOffset
-]
+_PeriodAddSub: TypeAlias = (
+    Timedelta | datetime.timedelta | np.timedelta64 | np.int64 | int | BaseOffset
+)
 
 _PeriodFreqHow: TypeAlias = Literal[
     "S",
@@ -40,9 +39,9 @@ _PeriodFreqHow: TypeAlias = Literal[
     "end",
 ]
 
-_PeriodToTimestampHow: TypeAlias = Union[
-    _PeriodFreqHow,
-    Literal[
+_PeriodToTimestampHow: TypeAlias = (
+    _PeriodFreqHow
+    | Literal[
         "Start",
         "Finish",
         "Begin",
@@ -51,8 +50,8 @@ _PeriodToTimestampHow: TypeAlias = Union[
         "e",
         "finish",
         "begin",
-    ],
-]
+    ]
+)
 
 class PeriodMixin:
     @property

pandas-stubs/_libs/tslibs/timedeltas.pyi

@@ -4,8 +4,6 @@ from typing import (
     ClassVar,
     Literal,
     NamedTuple,
-    TypeVar,
-    Union,
     overload,
 )
 
@@ -23,7 +21,10 @@ from pandas.core.series import (
     TimedeltaSeries,
     TimestampSeries,
 )
-from typing_extensions import TypeAlias
+from typing_extensions import (
+    Self,
+    TypeAlias,
+)
 
 from pandas._libs.tslibs import (
     BaseOffset,
@@ -91,24 +92,22 @@ TimeDeltaUnitChoices: TypeAlias = Literal[
     "n",
 ]
 
-UnitChoices: TypeAlias = Union[
-    TimeDeltaUnitChoices,
-    Literal[
+UnitChoices: TypeAlias = (
+    TimeDeltaUnitChoices
+    | Literal[
         "Y",
         "y",
         "M",
-    ],
-]
-
-_S = TypeVar("_S", bound=timedelta)
+    ]
+)
 
 class Timedelta(timedelta):
     min: ClassVar[Timedelta]
     max: ClassVar[Timedelta]
     resolution: ClassVar[Timedelta]
     value: int
     def __new__(
-        cls: type[_S],
+        cls,
         value: str | int | Timedelta | timedelta | np.timedelta64 = ...,
         unit: TimeDeltaUnitChoices = ...,
         *,
@@ -119,7 +118,7 @@ class Timedelta(timedelta):
         minutes: float | np.integer | np.floating = ...,
         hours: float | np.integer | np.floating = ...,
         weeks: float | np.integer | np.floating = ...,
-    ) -> _S: ...
+    ) -> Self: ...
     # GH 46171
     # While Timedelta can return pd.NaT, having the constructor return
     # a Union with NaTType makes things awkward for users of pandas
@@ -137,9 +136,9 @@ class Timedelta(timedelta):
     @property
     def asm8(self) -> np.timedelta64: ...
     # TODO: round/floor/ceil could return NaT?
-    def round(self: _S, freq: str | BaseOffset) -> _S: ...
-    def floor(self: _S, freq: str | BaseOffset) -> _S: ...
-    def ceil(self: _S, freq: str | BaseOffset) -> _S: ...
+    def round(self, freq: str | BaseOffset) -> Self: ...
+    def floor(self, freq: str | BaseOffset) -> Self: ...
+    def ceil(self, freq: str | BaseOffset) -> Self: ...
     @property
     def resolution_string(self) -> str: ...
     # Override due to more types supported than dt.timedelta

pandas-stubs/_libs/tslibs/timestamps.pyi

@@ -9,8 +9,6 @@ from time import struct_time
 from typing import (
     ClassVar,
     Literal,
-    TypeVar,
-    Union,
     overload,
 )
 
@@ -25,7 +23,10 @@ from pandas.core.series import (
     TimedeltaSeries,
     TimestampSeries,
 )
-from typing_extensions import TypeAlias
+from typing_extensions import (
+    Self,
+    TypeAlias,
+)
 
 from pandas._libs.tslibs import (
     BaseOffset,
@@ -38,11 +39,10 @@ from pandas._typing import (
     npt,
 )
 
-_DatetimeT = TypeVar("_DatetimeT", bound=datetime)
-_Ambiguous: TypeAlias = Union[bool, Literal["raise", "NaT"]]
-_Nonexistent: TypeAlias = Union[
-    Literal["raise", "NaT", "shift_backward", "shift_forward"], Timedelta, timedelta
-]
+_Ambiguous: TypeAlias = bool | Literal["raise", "NaT"]
+_Nonexistent: TypeAlias = (
+    Literal["raise", "NaT", "shift_backward", "shift_forward"] | Timedelta | timedelta
+)
 
 class Timestamp(datetime):
     min: ClassVar[Timestamp]
@@ -51,7 +51,7 @@ class Timestamp(datetime):
     resolution: ClassVar[Timedelta]
     value: int
     def __new__(
-        cls: type[_DatetimeT],
+        cls,
         ts_input: np.integer | float | str | _date | datetime | np.datetime64 = ...,
         # Freq is deprecated but is left in to allow code like Timestamp(2000,1,1)
         # Removing it would make the other arguments position only
@@ -69,7 +69,7 @@ class Timestamp(datetime):
         tzinfo: _tzinfo | None = ...,
         *,
         fold: Literal[0, 1] | None = ...,
-    ) -> _DatetimeT: ...
+    ) -> Self: ...
     # GH 46171
     # While Timestamp can return pd.NaT, having the constructor return
     # a Union with NaTType makes things awkward for users of pandas
@@ -96,30 +96,28 @@ class Timestamp(datetime):
     @property
     def fold(self) -> int: ...
     @classmethod
-    def fromtimestamp(
-        cls: type[_DatetimeT], t: float, tz: _tzinfo | str | None = ...
-    ) -> _DatetimeT: ...
+    def fromtimestamp(cls, t: float, tz: _tzinfo | str | None = ...) -> Self: ...
     @classmethod
-    def utcfromtimestamp(cls: type[_DatetimeT], ts: float) -> _DatetimeT: ...
+    def utcfromtimestamp(cls, ts: float) -> Self: ...
     @classmethod
-    def today(cls: type[_DatetimeT], tz: _tzinfo | str | None = ...) -> _DatetimeT: ...
+    def today(cls, tz: _tzinfo | str | None = ...) -> Self: ...
     @classmethod
     def fromordinal(
-        cls: type[_DatetimeT],
+        cls,
         ordinal: int,
         # freq produces a FutureWarning about being deprecated in a future version
         freq: None = ...,
         tz: _tzinfo | str | None = ...,
-    ) -> _DatetimeT: ...
+    ) -> Self: ...
     @classmethod
-    def now(cls: type[_DatetimeT], tz: _tzinfo | str | None = ...) -> _DatetimeT: ...
+    def now(cls, tz: _tzinfo | str | None = ...) -> Self: ...
     @classmethod
-    def utcnow(cls: type[_DatetimeT]) -> _DatetimeT: ...
+    def utcnow(cls) -> Self: ...
     # error: Signature of "combine" incompatible with supertype "datetime"
     @classmethod
     def combine(cls, date: _date, time: _time) -> datetime: ...  # type: ignore[override]
     @classmethod
-    def fromisoformat(cls: type[_DatetimeT], date_string: str) -> _DatetimeT: ...
+    def fromisoformat(cls, date_string: str) -> Self: ...
     def strftime(self, format: str) -> str: ...
     def __format__(self, fmt: str) -> str: ...
     def toordinal(self) -> int: ...
@@ -144,7 +142,7 @@ class Timestamp(datetime):
         tzinfo: _tzinfo | None = ...,
         fold: Literal[0, 1] | None = ...,
     ) -> Timestamp: ...
-    def astimezone(self: _DatetimeT, tz: _tzinfo | None = ...) -> _DatetimeT: ...
+    def astimezone(self, tz: _tzinfo | None = ...) -> Self: ...
     def ctime(self) -> str: ...
     def isoformat(self, sep: str = ..., timespec: str = ...) -> str: ...
     @classmethod
@@ -184,15 +182,13 @@ class Timestamp(datetime):
         self, other: npt.NDArray[np.timedelta64]
     ) -> npt.NDArray[np.datetime64]: ...
     @overload
-    def __add__(
-        self: _DatetimeT, other: timedelta | np.timedelta64 | Tick
-    ) -> _DatetimeT: ...
+    def __add__(self, other: timedelta | np.timedelta64 | Tick) -> Self: ...
     @overload
     def __add__(self, other: TimedeltaSeries) -> TimestampSeries: ...
     @overload
     def __add__(self, other: TimedeltaIndex) -> DatetimeIndex: ...
     @overload
-    def __radd__(self: _DatetimeT, other: timedelta) -> _DatetimeT: ...
+    def __radd__(self, other: timedelta) -> Self: ...
     @overload
     def __radd__(self, other: TimedeltaIndex) -> DatetimeIndex: ...
     @overload
@@ -203,9 +199,7 @@ class Timestamp(datetime):
     @overload  # type: ignore[override]
     def __sub__(self, other: Timestamp | datetime | np.datetime64) -> Timedelta: ...
     @overload
-    def __sub__(
-        self: _DatetimeT, other: timedelta | np.timedelta64 | Tick
-    ) -> _DatetimeT: ...
+    def __sub__(self, other: timedelta | np.timedelta64 | Tick) -> Self: ...
     @overload
     def __sub__(self, other: TimedeltaIndex) -> DatetimeIndex: ...
     @overload
@@ -253,34 +247,34 @@ class Timestamp(datetime):
     def to_julian_date(self) -> np.float64: ...
     @property
     def asm8(self) -> np.datetime64: ...
-    def tz_convert(self: _DatetimeT, tz: _tzinfo | str | None) -> _DatetimeT: ...
+    def tz_convert(self, tz: _tzinfo | str | None) -> Self: ...
     # TODO: could return NaT?
     def tz_localize(
-        self: _DatetimeT,
+        self,
         tz: _tzinfo | str | None,
         ambiguous: _Ambiguous = ...,
         nonexistent: _Nonexistent = ...,
-    ) -> _DatetimeT: ...
-    def normalize(self: _DatetimeT) -> _DatetimeT: ...
+    ) -> Self: ...
+    def normalize(self) -> Self: ...
     # TODO: round/floor/ceil could return NaT?
     def round(
-        self: _DatetimeT,
+        self,
         freq: str,
         ambiguous: _Ambiguous = ...,
         nonexistent: _Nonexistent = ...,
-    ) -> _DatetimeT: ...
+    ) -> Self: ...
     def floor(
-        self: _DatetimeT,
+        self,
         freq: str,
         ambiguous: _Ambiguous = ...,
         nonexistent: _Nonexistent = ...,
-    ) -> _DatetimeT: ...
+    ) -> Self: ...
     def ceil(
-        self: _DatetimeT,
+        self,
         freq: str,
         ambiguous: _Ambiguous = ...,
         nonexistent: _Nonexistent = ...,
-    ) -> _DatetimeT: ...
+    ) -> Self: ...
     def day_name(self, locale: str | None = ...) -> str: ...
     def month_name(self, locale: str | None = ...) -> str: ...
     @property