Update to mypy 1.0.1

Author: bryanforbes

pendulum/date.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 from datetime import timedelta
+from typing import TYPE_CHECKING
 from typing import cast
 from typing import overload
 
@@ -12,6 +13,9 @@
 from pendulum.constants import US_PER_SECOND
 from pendulum.utils._compat import PYPY
 
+if TYPE_CHECKING:
+    from typing_extensions import Self
+
 
 def _divide_and_round(a: float, b: float) -> int:
     """divide a by b and round result to the nearest integer
@@ -74,7 +78,7 @@ def __new__(
         weeks: float = 0,
         years: float = 0,
         months: float = 0,
-    ) -> Duration:
+    ) -> Self:
         if not isinstance(years, int) or not isinstance(months, int):
             raise ValueError("Float year and months are not supported")
 
@@ -313,21 +317,21 @@ def __repr__(self) -> str:
 
         return rep.replace(", )", ")")
 
-    def __add__(self, other: timedelta) -> Duration:
+    def __add__(self, other: timedelta) -> Self:
         if isinstance(other, timedelta):
             return self.__class__(seconds=self.total_seconds() + other.total_seconds())
 
         return NotImplemented
 
     __radd__ = __add__
 
-    def __sub__(self, other: timedelta) -> Duration:
+    def __sub__(self, other: timedelta) -> Self:
         if isinstance(other, timedelta):
             return self.__class__(seconds=self.total_seconds() - other.total_seconds())
 
         return NotImplemented
 
-    def __neg__(self) -> Duration:
+    def __neg__(self) -> Self:
         return self.__class__(
             years=-self._years,
             months=-self._months,
@@ -340,7 +344,7 @@ def __neg__(self) -> Duration:
     def _to_microseconds(self) -> int:
         return (self._days * (24 * 3600) + self._seconds) * 1000000 + self._microseconds
 
-    def __mul__(self, other: int | float) -> Duration:
+    def __mul__(self, other: int | float) -> Self:
         if isinstance(other, int):
             return self.__class__(
                 years=self._years * other,
@@ -363,7 +367,7 @@ def __floordiv__(self, other: timedelta) -> int:
         ...
 
     @overload
-    def __floordiv__(self, other: int) -> Duration:
+    def __floordiv__(self, other: int) -> Self:
         ...
 
     def __floordiv__(self, other: int | timedelta) -> int | Duration:
@@ -388,10 +392,10 @@ def __truediv__(self, other: timedelta) -> float:
         ...
 
     @overload
-    def __truediv__(self, other: float) -> Duration:
+    def __truediv__(self, other: float) -> Self:
         ...
 
-    def __truediv__(self, other: int | float | timedelta) -> Duration | float:
+    def __truediv__(self, other: int | float | timedelta) -> Self | float:
         if not isinstance(other, (int, float, timedelta)):
             return NotImplemented
 
@@ -421,7 +425,7 @@ def __truediv__(self, other: int | float | timedelta) -> Duration | float:
 
     __div__ = __floordiv__
 
-    def __mod__(self, other: timedelta) -> Duration:
+    def __mod__(self, other: timedelta) -> Self:
         if isinstance(other, timedelta):
             r = self._to_microseconds() % other._to_microseconds()  # type: ignore[attr-defined]
 

pendulum/datetime.py

@@ -54,7 +54,7 @@
 
 @overload
 def add_duration(
-    dt: datetime,
+    dt: _DT,
     years: int = 0,
     months: int = 0,
     weeks: int = 0,
@@ -63,23 +63,23 @@ def add_duration(
     minutes: int = 0,
     seconds: float = 0,
     microseconds: int = 0,
-) -> datetime:
+) -> _DT:
     ...
 
 
 @overload
 def add_duration(
-    dt: date,
+    dt: _D,
     years: int = 0,
     months: int = 0,
     weeks: int = 0,
     days: int = 0,
-) -> date:
+) -> _D:
     pass
 
 
 def add_duration(
-    dt: date | datetime,
+    dt: _D,
     years: int = 0,
     months: int = 0,
     weeks: int = 0,
@@ -88,7 +88,7 @@ def add_duration(
     minutes: int = 0,
     seconds: float = 0,
     microseconds: int = 0,
-) -> date | datetime:
+) -> _D:
     """
     Adds a duration to a date/datetime instance.
     """

pendulum/duration.py

@@ -18,6 +18,7 @@
 from pendulum.helpers import precise_diff
 
 if TYPE_CHECKING:
+    from typing_extensions import Self
     from typing_extensions import SupportsIndex
 
     from pendulum.helpers import PreciseDiff
@@ -35,7 +36,7 @@ def __new__(
         start: pendulum.DateTime | datetime,
         end: pendulum.DateTime | datetime,
         absolute: bool = False,
-    ) -> Interval:
+    ) -> Self:
         ...
 
     @overload
@@ -44,15 +45,15 @@ def __new__(
         start: pendulum.Date | date,
         end: pendulum.Date | date,
         absolute: bool = False,
-    ) -> Interval:
+    ) -> Self:
         ...
 
     def __new__(
         cls,
         start: pendulum.DateTime | pendulum.Date | datetime | date,
         end: pendulum.DateTime | pendulum.Date | datetime | date,
         absolute: bool = False,
-    ) -> Interval:
+    ) -> Self:
         if (
             isinstance(start, datetime)
             and not isinstance(end, datetime)
@@ -125,7 +126,7 @@ def __new__(
 
         delta: timedelta = _end - _start  # type: ignore[operator]
 
-        return cast(Interval, super().__new__(cls, seconds=delta.total_seconds()))
+        return super().__new__(cls, seconds=delta.total_seconds())
 
     def __init__(
         self,
@@ -316,9 +317,9 @@ def range(
 
             i += amount
 
-    def as_interval(self) -> Duration:
+    def as_duration(self) -> Duration:
         """
-        Return the Period as a Duration.
+        Return the Interval as a Duration.
         """
         return Duration(seconds=self.total_seconds())
 
@@ -330,23 +331,23 @@ def __contains__(
     ) -> bool:
         return self.start <= item <= self.end
 
-    def __add__(self, other: timedelta) -> Duration:
-        return self.as_interval().__add__(other)
+    def __add__(self, other: timedelta) -> Duration:  # type: ignore[override]
+        return self.as_duration().__add__(other)
 
-    __radd__ = __add__
+    __radd__ = __add__  # type: ignore[assignment]
 
-    def __sub__(self, other: timedelta) -> Duration:
-        return self.as_interval().__sub__(other)
+    def __sub__(self, other: timedelta) -> Duration:  # type: ignore[override]
+        return self.as_duration().__sub__(other)
 
-    def __neg__(self) -> Interval:
+    def __neg__(self) -> Self:
         return self.__class__(self.end, self.start, self._absolute)
 
-    def __mul__(self, other: int | float) -> Duration:
-        return self.as_interval().__mul__(other)
+    def __mul__(self, other: int | float) -> Duration:  # type: ignore[override]
+        return self.as_duration().__mul__(other)
 
-    __rmul__ = __mul__
+    __rmul__ = __mul__  # type: ignore[assignment]
 
-    @overload
+    @overload  # type: ignore[override]
     def __floordiv__(self, other: timedelta) -> int:
         ...
 
@@ -355,11 +356,11 @@ def __floordiv__(self, other: int) -> Duration:
         ...
 
     def __floordiv__(self, other: int | timedelta) -> int | Duration:
-        return self.as_interval().__floordiv__(other)
+        return self.as_duration().__floordiv__(other)
 
     __div__ = __floordiv__  # type: ignore[assignment]
 
-    @overload
+    @overload  # type: ignore[override]
     def __truediv__(self, other: timedelta) -> float:
         ...
 
@@ -368,15 +369,15 @@ def __truediv__(self, other: float) -> Duration:
         ...
 
     def __truediv__(self, other: float | timedelta) -> Duration | float:
-        return self.as_interval().__truediv__(other)
+        return self.as_duration().__truediv__(other)
 
-    def __mod__(self, other: timedelta) -> Duration:
-        return self.as_interval().__mod__(other)
+    def __mod__(self, other: timedelta) -> Duration:  # type: ignore[override]
+        return self.as_duration().__mod__(other)
 
     def __divmod__(self, other: timedelta) -> tuple[int, Duration]:
-        return self.as_interval().__divmod__(other)
+        return self.as_duration().__divmod__(other)
 
-    def __abs__(self) -> Interval:
+    def __abs__(self) -> Self:
         return self.__class__(self.start, self.end, absolute=True)
 
     def __repr__(self) -> str:
@@ -413,7 +414,7 @@ def _getstate(
     def __reduce__(
         self,
     ) -> tuple[
-        type[Interval],
+        type[Self],
         tuple[
             pendulum.DateTime | pendulum.Date | datetime | date,
             pendulum.DateTime | pendulum.Date | datetime | date,
@@ -425,7 +426,7 @@ def __reduce__(
     def __reduce_ex__(
         self, protocol: SupportsIndex
     ) -> tuple[
-        type[Interval],
+        type[Self],
         tuple[
             pendulum.DateTime | pendulum.Date | datetime | date,
             pendulum.DateTime | pendulum.Date | datetime | date,
@@ -445,4 +446,4 @@ def __eq__(self, other: object) -> bool:
                 other._absolute,
             )
         else:
-            return self.as_interval() == other
+            return self.as_duration() == other

pendulum/helpers.py

@@ -5,7 +5,6 @@ from datetime import datetime
 from datetime import time
 
 class Duration:
-
     years: int = 0
     months: int = 0
     weeks: int = 0

pendulum/interval.py

@@ -20,6 +20,7 @@
 
 if TYPE_CHECKING:
     from typing_extensions import Literal
+    from typing_extensions import Self
     from typing_extensions import SupportsIndex
 
 
@@ -45,7 +46,7 @@ def __repr__(self) -> str:
 
     # Comparisons
 
-    def closest(self, dt1: Time | time, dt2: Time | time) -> Time:
+    def closest(self, dt1: Time | time, dt2: Time | time) -> Self:
         """
         Get the closest time from the instance.
         """
@@ -57,7 +58,7 @@ def closest(self, dt1: Time | time, dt2: Time | time) -> Time:
 
         return dt2
 
-    def farthest(self, dt1: Time | time, dt2: Time | time) -> Time:
+    def farthest(self, dt1: Time | time, dt2: Time | time) -> Self:
         """
         Get the farthest time from the instance.
         """
@@ -257,7 +258,7 @@ def replace(
         microsecond: int | None = None,
         tzinfo: bool | datetime.tzinfo | Literal[True] | None = True,
         fold: int = 0,
-    ) -> Time:
+    ) -> Self:
         if tzinfo is True:
             tzinfo = self.tzinfo