Big diff: Use new "|" union syntax (#5872)

stdlib/unittest/case.pyi

@@ -17,13 +17,11 @@ from typing import (
     Mapping,
     NamedTuple,
     NoReturn,
-    Optional,
     Pattern,
     Sequence,
     Tuple,
     Type,
     TypeVar,
-    Union,
     overload,
 )
 from warnings import WarningMessage
@@ -49,7 +47,7 @@ class SkipTest(Exception):
 class TestCase:
     failureException: Type[BaseException]
     longMessage: bool
-    maxDiff: Optional[int]
+    maxDiff: int | None
     # undocumented
     _testMethodName: str
     # undocumented
@@ -61,8 +59,8 @@ class TestCase:
     def setUpClass(cls) -> None: ...
     @classmethod
     def tearDownClass(cls) -> None: ...
-    def run(self, result: Optional[unittest.result.TestResult] = ...) -> Optional[unittest.result.TestResult]: ...
-    def __call__(self, result: Optional[unittest.result.TestResult] = ...) -> Optional[unittest.result.TestResult]: ...
+    def run(self, result: unittest.result.TestResult | None = ...) -> unittest.result.TestResult | None: ...
+    def __call__(self, result: unittest.result.TestResult | None = ...) -> unittest.result.TestResult | None: ...
     def skipTest(self, reason: Any) -> None: ...
     def subTest(self, msg: Any = ..., **params: Any) -> ContextManager[None]: ...
     def debug(self) -> None: ...
@@ -75,10 +73,10 @@ class TestCase:
     def assertIsNot(self, expr1: Any, expr2: Any, msg: Any = ...) -> None: ...
     def assertIsNone(self, obj: Any, msg: Any = ...) -> None: ...
     def assertIsNotNone(self, obj: Any, msg: Any = ...) -> None: ...
-    def assertIn(self, member: Any, container: Union[Iterable[Any], Container[Any]], msg: Any = ...) -> None: ...
-    def assertNotIn(self, member: Any, container: Union[Iterable[Any], Container[Any]], msg: Any = ...) -> None: ...
-    def assertIsInstance(self, obj: Any, cls: Union[type, Tuple[type, ...]], msg: Any = ...) -> None: ...
-    def assertNotIsInstance(self, obj: Any, cls: Union[type, Tuple[type, ...]], msg: Any = ...) -> None: ...
+    def assertIn(self, member: Any, container: Iterable[Any] | Container[Any], msg: Any = ...) -> None: ...
+    def assertNotIn(self, member: Any, container: Iterable[Any] | Container[Any], msg: Any = ...) -> None: ...
+    def assertIsInstance(self, obj: Any, cls: type | Tuple[type, ...], msg: Any = ...) -> None: ...
+    def assertNotIsInstance(self, obj: Any, cls: type | Tuple[type, ...], msg: Any = ...) -> None: ...
     def assertGreater(self, a: Any, b: Any, msg: Any = ...) -> None: ...
     def assertGreaterEqual(self, a: Any, b: Any, msg: Any = ...) -> None: ...
     def assertLess(self, a: Any, b: Any, msg: Any = ...) -> None: ...
@@ -86,20 +84,18 @@ class TestCase:
     @overload
     def assertRaises(  # type: ignore
         self,
-        expected_exception: Union[Type[BaseException], Tuple[Type[BaseException], ...]],
+        expected_exception: Type[BaseException] | Tuple[Type[BaseException], ...],
         callable: Callable[..., Any],
         *args: Any,
         **kwargs: Any,
     ) -> None: ...
     @overload
-    def assertRaises(
-        self, expected_exception: Union[Type[_E], Tuple[Type[_E], ...]], msg: Any = ...
-    ) -> _AssertRaisesContext[_E]: ...
+    def assertRaises(self, expected_exception: Type[_E] | Tuple[Type[_E], ...], msg: Any = ...) -> _AssertRaisesContext[_E]: ...
     @overload
     def assertRaisesRegex(  # type: ignore
         self,
-        expected_exception: Union[Type[BaseException], Tuple[Type[BaseException], ...]],
-        expected_regex: Union[str, bytes, Pattern[str], Pattern[bytes]],
+        expected_exception: Type[BaseException] | Tuple[Type[BaseException], ...],
+        expected_regex: str | bytes | Pattern[str] | Pattern[bytes],
         callable: Callable[..., Any],
         *args: Any,
         **kwargs: Any,
@@ -107,27 +103,21 @@ class TestCase:
     @overload
     def assertRaisesRegex(
         self,
-        expected_exception: Union[Type[_E], Tuple[Type[_E], ...]],
-        expected_regex: Union[str, bytes, Pattern[str], Pattern[bytes]],
+        expected_exception: Type[_E] | Tuple[Type[_E], ...],
+        expected_regex: str | bytes | Pattern[str] | Pattern[bytes],
         msg: Any = ...,
     ) -> _AssertRaisesContext[_E]: ...
     @overload
     def assertWarns(  # type: ignore
-        self,
-        expected_warning: Union[Type[Warning], Tuple[Type[Warning], ...]],
-        callable: Callable[..., Any],
-        *args: Any,
-        **kwargs: Any,
+        self, expected_warning: Type[Warning] | Tuple[Type[Warning], ...], callable: Callable[..., Any], *args: Any, **kwargs: Any
     ) -> None: ...
     @overload
-    def assertWarns(
-        self, expected_warning: Union[Type[Warning], Tuple[Type[Warning], ...]], msg: Any = ...
-    ) -> _AssertWarnsContext: ...
+    def assertWarns(self, expected_warning: Type[Warning] | Tuple[Type[Warning], ...], msg: Any = ...) -> _AssertWarnsContext: ...
     @overload
     def assertWarnsRegex(  # type: ignore
         self,
-        expected_warning: Union[Type[Warning], Tuple[Type[Warning], ...]],
-        expected_regex: Union[str, bytes, Pattern[str], Pattern[bytes]],
+        expected_warning: Type[Warning] | Tuple[Type[Warning], ...],
+        expected_regex: str | bytes | Pattern[str] | Pattern[bytes],
         callable: Callable[..., Any],
         *args: Any,
         **kwargs: Any,
@@ -135,48 +125,46 @@ class TestCase:
     @overload
     def assertWarnsRegex(
         self,
-        expected_warning: Union[Type[Warning], Tuple[Type[Warning], ...]],
-        expected_regex: Union[str, bytes, Pattern[str], Pattern[bytes]],
+        expected_warning: Type[Warning] | Tuple[Type[Warning], ...],
+        expected_regex: str | bytes | Pattern[str] | Pattern[bytes],
         msg: Any = ...,
     ) -> _AssertWarnsContext: ...
-    def assertLogs(
-        self, logger: Optional[Union[str, logging.Logger]] = ..., level: Union[int, str, None] = ...
-    ) -> _AssertLogsContext: ...
+    def assertLogs(self, logger: str | logging.Logger | None = ..., level: int | str | None = ...) -> _AssertLogsContext: ...
     @overload
     def assertAlmostEqual(
-        self, first: float, second: float, places: Optional[int] = ..., msg: Any = ..., delta: Optional[float] = ...
+        self, first: float, second: float, places: int | None = ..., msg: Any = ..., delta: float | None = ...
     ) -> None: ...
     @overload
     def assertAlmostEqual(
         self,
         first: datetime.datetime,
         second: datetime.datetime,
-        places: Optional[int] = ...,
+        places: int | None = ...,
         msg: Any = ...,
-        delta: Optional[datetime.timedelta] = ...,
+        delta: datetime.timedelta | None = ...,
     ) -> None: ...
     @overload
     def assertNotAlmostEqual(self, first: float, second: float, *, msg: Any = ...) -> None: ...
     @overload
-    def assertNotAlmostEqual(self, first: float, second: float, places: Optional[int] = ..., msg: Any = ...) -> None: ...
+    def assertNotAlmostEqual(self, first: float, second: float, places: int | None = ..., msg: Any = ...) -> None: ...
     @overload
-    def assertNotAlmostEqual(self, first: float, second: float, *, msg: Any = ..., delta: Optional[float] = ...) -> None: ...
+    def assertNotAlmostEqual(self, first: float, second: float, *, msg: Any = ..., delta: float | None = ...) -> None: ...
     @overload
     def assertNotAlmostEqual(
         self,
         first: datetime.datetime,
         second: datetime.datetime,
-        places: Optional[int] = ...,
+        places: int | None = ...,
         msg: Any = ...,
-        delta: Optional[datetime.timedelta] = ...,
+        delta: datetime.timedelta | None = ...,
     ) -> None: ...
-    def assertRegex(self, text: AnyStr, expected_regex: Union[AnyStr, Pattern[AnyStr]], msg: Any = ...) -> None: ...
-    def assertNotRegex(self, text: AnyStr, unexpected_regex: Union[AnyStr, Pattern[AnyStr]], msg: Any = ...) -> None: ...
+    def assertRegex(self, text: AnyStr, expected_regex: AnyStr | Pattern[AnyStr], msg: Any = ...) -> None: ...
+    def assertNotRegex(self, text: AnyStr, unexpected_regex: AnyStr | Pattern[AnyStr], msg: Any = ...) -> None: ...
     def assertCountEqual(self, first: Iterable[Any], second: Iterable[Any], msg: Any = ...) -> None: ...
     def addTypeEqualityFunc(self, typeobj: Type[Any], function: Callable[..., None]) -> None: ...
     def assertMultiLineEqual(self, first: str, second: str, msg: Any = ...) -> None: ...
     def assertSequenceEqual(
-        self, seq1: Sequence[Any], seq2: Sequence[Any], msg: Any = ..., seq_type: Optional[Type[Sequence[Any]]] = ...
+        self, seq1: Sequence[Any], seq2: Sequence[Any], msg: Any = ..., seq_type: Type[Sequence[Any]] | None = ...
     ) -> None: ...
     def assertListEqual(self, list1: List[Any], list2: List[Any], msg: Any = ...) -> None: ...
     def assertTupleEqual(self, tuple1: Tuple[Any, ...], tuple2: Tuple[Any, ...], msg: Any = ...) -> None: ...
@@ -186,7 +174,7 @@ class TestCase:
     def countTestCases(self) -> int: ...
     def defaultTestResult(self) -> unittest.result.TestResult: ...
     def id(self) -> str: ...
-    def shortDescription(self) -> Optional[str]: ...
+    def shortDescription(self) -> str | None: ...
     if sys.version_info >= (3, 8):
         def addCleanup(self, __function: Callable[..., Any], *args: Any, **kwargs: Any) -> None: ...
     else:
@@ -197,7 +185,7 @@ class TestCase:
         def addClassCleanup(cls, __function: Callable[..., Any], *args: Any, **kwargs: Any) -> None: ...
         @classmethod
         def doClassCleanups(cls) -> None: ...
-    def _formatMessage(self, msg: Optional[str], standardMsg: str) -> str: ...  # undocumented
+    def _formatMessage(self, msg: str | None, standardMsg: str) -> str: ...  # undocumented
     def _getAssertEqualityFunc(self, first: Any, second: Any) -> Callable[..., None]: ...  # undocumented
     # below is deprecated
     def failUnlessEqual(self, first: Any, second: Any, msg: Any = ...) -> None: ...
@@ -210,26 +198,26 @@ class TestCase:
     @overload
     def failUnlessRaises(  # type: ignore
         self,
-        exception: Union[Type[BaseException], Tuple[Type[BaseException], ...]],
+        exception: Type[BaseException] | Tuple[Type[BaseException], ...],
         callable: Callable[..., Any] = ...,
         *args: Any,
         **kwargs: Any,
     ) -> None: ...
     @overload
-    def failUnlessRaises(self, exception: Union[Type[_E], Tuple[Type[_E], ...]], msg: Any = ...) -> _AssertRaisesContext[_E]: ...
+    def failUnlessRaises(self, exception: Type[_E] | Tuple[Type[_E], ...], msg: Any = ...) -> _AssertRaisesContext[_E]: ...
     def failUnlessAlmostEqual(self, first: float, second: float, places: int = ..., msg: Any = ...) -> None: ...
     def assertAlmostEquals(self, first: float, second: float, places: int = ..., msg: Any = ..., delta: float = ...) -> None: ...
     def failIfAlmostEqual(self, first: float, second: float, places: int = ..., msg: Any = ...) -> None: ...
     def assertNotAlmostEquals(
         self, first: float, second: float, places: int = ..., msg: Any = ..., delta: float = ...
     ) -> None: ...
-    def assertRegexpMatches(self, text: AnyStr, regex: Union[AnyStr, Pattern[AnyStr]], msg: Any = ...) -> None: ...
-    def assertNotRegexpMatches(self, text: AnyStr, regex: Union[AnyStr, Pattern[AnyStr]], msg: Any = ...) -> None: ...
+    def assertRegexpMatches(self, text: AnyStr, regex: AnyStr | Pattern[AnyStr], msg: Any = ...) -> None: ...
+    def assertNotRegexpMatches(self, text: AnyStr, regex: AnyStr | Pattern[AnyStr], msg: Any = ...) -> None: ...
     @overload
     def assertRaisesRegexp(  # type: ignore
         self,
-        exception: Union[Type[BaseException], Tuple[Type[BaseException], ...]],
-        expected_regex: Union[str, bytes, Pattern[str], Pattern[bytes]],
+        exception: Type[BaseException] | Tuple[Type[BaseException], ...],
+        expected_regex: str | bytes | Pattern[str] | Pattern[bytes],
         callable: Callable[..., Any],
         *args: Any,
         **kwargs: Any,
@@ -237,8 +225,8 @@ class TestCase:
     @overload
     def assertRaisesRegexp(
         self,
-        exception: Union[Type[_E], Tuple[Type[_E], ...]],
-        expected_regex: Union[str, bytes, Pattern[str], Pattern[bytes]],
+        exception: Type[_E] | Tuple[Type[_E], ...],
+        expected_regex: str | bytes | Pattern[str] | Pattern[bytes],
         msg: Any = ...,
     ) -> _AssertRaisesContext[_E]: ...
     def assertDictContainsSubset(self, subset: Mapping[Any, Any], dictionary: Mapping[Any, Any], msg: object = ...) -> None: ...
@@ -247,9 +235,9 @@ class FunctionTestCase(TestCase):
     def __init__(
         self,
         testFunc: Callable[[], None],
-        setUp: Optional[Callable[[], None]] = ...,
-        tearDown: Optional[Callable[[], None]] = ...,
-        description: Optional[str] = ...,
+        setUp: Callable[[], None] | None = ...,
+        tearDown: Callable[[], None] | None = ...,
+        description: str | None = ...,
     ) -> None: ...
     def runTest(self) -> None: ...
 
@@ -261,7 +249,7 @@ class _AssertRaisesContext(Generic[_E]):
     exception: _E
     def __enter__(self: Self) -> Self: ...
     def __exit__(
-        self, exc_type: Optional[Type[BaseException]], exc_val: Optional[BaseException], exc_tb: Optional[TracebackType]
+        self, exc_type: Type[BaseException] | None, exc_val: BaseException | None, exc_tb: TracebackType | None
     ) -> bool: ...
     if sys.version_info >= (3, 9):
         def __class_getitem__(cls, item: Any) -> GenericAlias: ...
@@ -273,7 +261,7 @@ class _AssertWarnsContext:
     warnings: List[WarningMessage]
     def __enter__(self: Self) -> Self: ...
     def __exit__(
-        self, exc_type: Optional[Type[BaseException]], exc_val: Optional[BaseException], exc_tb: Optional[TracebackType]
+        self, exc_type: Type[BaseException] | None, exc_val: BaseException | None, exc_tb: TracebackType | None
     ) -> None: ...
 
 class _AssertLogsContext:
@@ -286,5 +274,5 @@ class _AssertLogsContext:
     else:
         def __enter__(self) -> _LoggingWatcher: ...
     def __exit__(
-        self, exc_type: Optional[Type[BaseException]], exc_val: Optional[BaseException], exc_tb: Optional[TracebackType]
-    ) -> Optional[bool]: ...
+        self, exc_type: Type[BaseException] | None, exc_val: BaseException | None, exc_tb: TracebackType | None
+    ) -> bool | None: ...