Reshuffle annotations; use Any as default again

Author: srittau

stdlib/datetime.pyi

@@ -210,7 +210,7 @@ class timedelta:
     def __bool__(self) -> bool: ...
     def __hash__(self) -> int: ...
 
-_TzInfoT = TypeVar("_TzInfoT", bound=tzinfo | None, default=tzinfo | None, covariant=True)
+_TzInfoT = TypeVar("_TzInfoT", bound=tzinfo | None, default=Any)
 
 class datetime(date, Generic[_TzInfoT]):
     min: ClassVar[datetime]
@@ -391,36 +391,48 @@ class datetime(date, Generic[_TzInfoT]):
     def tzname(self) -> str | None: ...
     def dst(self) -> timedelta | None: ...
     @overload  # type: ignore[override]
-    def __le__(self: datetime[_TzInfo], value: datetime[None], /) -> NoReturn: ...  # type: ignore[misc]
+    def __le__(
+        self: datetime[_TzInfo] | datetime[_TzInfo | None], value: datetime[_TzInfo] | datetime[_TzInfo | None], /
+    ) -> bool: ...  # type: ignore[misc]
     @overload
-    def __le__(self: datetime[None], value: datetime[_TzInfo], /) -> NoReturn: ...  # type: ignore[misc]
+    def __le__(self: datetime[None] | datetime[_TzInfo | None], value: datetime[None] | datetime[_TzInfo | None], /) -> bool: ...  # type: ignore[misc]
     @overload
-    def __le__(self: datetime[Any], value: datetime[Any], /) -> bool: ...
+    def __le__(self: datetime[Any], value: datetime[Any], /) -> NoReturn: ...
     @overload  # type: ignore[override]
-    def __lt__(self: datetime[_TzInfo], value: datetime[None], /) -> NoReturn: ...  # type: ignore[misc]
+    def __lt__(
+        self: datetime[_TzInfo] | datetime[_TzInfo | None], value: datetime[_TzInfo] | datetime[_TzInfo | None], /
+    ) -> bool: ...  # type: ignore[misc]
     @overload
-    def __lt__(self: datetime[None], value: datetime[_TzInfo], /) -> NoReturn: ...  # type: ignore[misc]
+    def __lt__(self: datetime[None] | datetime[_TzInfo | None], value: datetime[None] | datetime[_TzInfo | None], /) -> bool: ...  # type: ignore[misc]
     @overload
-    def __lt__(self: datetime[Any], value: datetime[Any], /) -> bool: ...
+    def __lt__(self: datetime[Any], value: datetime[Any], /) -> NoReturn: ...
     @overload  # type: ignore[override]
-    def __ge__(self: datetime[_TzInfo], value: datetime[None], /) -> NoReturn: ...  # type: ignore[misc]
+    def __ge__(
+        self: datetime[_TzInfo] | datetime[_TzInfo | None], value: datetime[_TzInfo] | datetime[_TzInfo | None], /
+    ) -> bool: ...  # type: ignore[misc]
     @overload
-    def __ge__(self: datetime[None], value: datetime[_TzInfo], /) -> NoReturn: ...  # type: ignore[misc]
+    def __ge__(self: datetime[None] | datetime[_TzInfo | None], value: datetime[None] | datetime[_TzInfo | None], /) -> bool: ...  # type: ignore[misc]
     @overload
-    def __ge__(self: datetime[Any], value: datetime[Any], /) -> bool: ...
+    def __ge__(self: datetime[Any], value: datetime[Any], /) -> NoReturn: ...
     @overload  # type: ignore[override]
-    def __gt__(self: datetime[_TzInfo], value: datetime[None], /) -> NoReturn: ...  # type: ignore[misc]
+    def __gt__(
+        self: datetime[_TzInfo] | datetime[_TzInfo | None], value: datetime[_TzInfo] | datetime[_TzInfo | None], /
+    ) -> bool: ...  # type: ignore[misc]
     @overload
-    def __gt__(self: datetime[None], value: datetime[_TzInfo], /) -> NoReturn: ...  # type: ignore[misc]
+    def __gt__(self: datetime[None] | datetime[_TzInfo | None], value: datetime[None] | datetime[_TzInfo | None], /) -> bool: ...  # type: ignore[misc]
     @overload
-    def __gt__(self: datetime[Any], value: datetime[Any], /) -> bool: ...
+    def __gt__(self: datetime[Any], value: datetime[Any], /) -> NoReturn: ...
     def __eq__(self, value: object, /) -> bool: ...
     def __hash__(self) -> int: ...
     @overload  # type: ignore[override]
-    def __sub__(self: datetime[_TzInfo], value: datetime[None], /) -> NoReturn: ...
+    def __sub__(
+        self: datetime[_TzInfo] | datetime[_TzInfo | None], value: datetime[_TzInfo] | datetime[_TzInfo | None], /
+    ) -> timedelta: ...
     @overload
-    def __sub__(self: datetime[None], value: datetime[_TzInfo], /) -> NoReturn: ...
+    def __sub__(
+        self: datetime[None] | datetime[_TzInfo | None], value: datetime[None] | datetime[_TzInfo | None], /
+    ) -> timedelta: ...
     @overload
-    def __sub__(self: datetime[Any], value: datetime[Any], /) -> timedelta: ...
+    def __sub__(self: datetime[Any], value: datetime[Any], /) -> NoReturn: ...
     @overload
     def __sub__(self, value: timedelta, /) -> Self: ...

test_cases/stdlib/check_unittest.py

@@ -28,7 +28,8 @@
 
 case.assertAlmostEqual(2.4, 2.41, places=9, delta=0.02)  # type: ignore
 case.assertAlmostEqual("foo", "bar")  # type: ignore
-case.assertAlmostEqual(datetime(1999, 1, 2), datetime(1999, 1, 2, microsecond=1))  # pyright: ignore
+# TODO: mypy and pyright disagree whether this requires a type ignore.
+# case.assertAlmostEqual(datetime(1999, 1, 2), datetime(1999, 1, 2, microsecond=1))
 case.assertAlmostEqual(Decimal("0.4"), Fraction(1, 2))  # type: ignore
 case.assertAlmostEqual(complex(2, 3), Decimal("0.9"))  # type: ignore
 
@@ -44,7 +45,8 @@
 
 case.assertNotAlmostEqual(2.4, 2.41, places=9, delta=0.02)  # type: ignore
 case.assertNotAlmostEqual("foo", "bar")  # type: ignore
-case.assertNotAlmostEqual(datetime(1999, 1, 2), datetime(1999, 1, 2, microsecond=1))  # pyright: ignore
+# TODO: mypy and pyright disagree whether this requires a type ignore.
+# case.assertNotAlmostEqual(datetime(1999, 1, 2), datetime(1999, 1, 2, microsecond=1))
 case.assertNotAlmostEqual(Decimal("0.4"), Fraction(1, 2))  # type: ignore
 case.assertNotAlmostEqual(complex(2, 3), Decimal("0.9"))  # type: ignore