Fix tests

python · JelleZijlstra · Mar 4, 2025 · Jun 8, 2023 · Jun 8, 2023 · Jun 8, 2023
commit 8bcb930ac59569157f98efc4508c9f13f2e11503
diff --git a/Lib/test/test_dataclasses.py b/Lib/test/test_dataclasses.py
@@ -2267,7 +2267,7 @@ def test_docstring_one_field_with_default_none(self):
         class C:
             x: Union[int, type(None)] = None
 
-        self.assertDocStrEqual(C.__doc__, "C(x:Optional[int]=None)")
+        self.assertDocStrEqual(C.__doc__, "C(x:int|None=None)")
 
     def test_docstring_list_field(self):
         @dataclass

@@ -2774,7 +2774,7 @@ def _(arg: typing.Union[int, typing.Iterable[str]]):
             "Invalid annotation for 'arg'."
         ))
         self.assertTrue(str(exc.exception).endswith(
-            'typing.Union[int, typing.Iterable[str]] not all arguments are classes.'
+            'int | typing.Iterable[str] not all arguments are classes.'
         ))
 
     def test_invalid_positional_argument(self):

diff --git a/Lib/test/test_inspect.py b/Lib/test/test_inspect.py
@@ -1507,8 +1507,8 @@ def wrapper(a, b):
 class TestFormatAnnotation(unittest.TestCase):
     def test_typing_replacement(self):
         from test.typinganndata.ann_module9 import ann, ann1
-        self.assertEqual(inspect.formatannotation(ann), 'Union[List[str], int]')
-        self.assertEqual(inspect.formatannotation(ann1), 'Union[List[testModule.typing.A], int]')
+        self.assertEqual(inspect.formatannotation(ann), 'typing.List[str] | int')
+        self.assertEqual(inspect.formatannotation(ann1), 'typing.List[testModule.typing.A] | int')
 
 
 class TestIsDataDescriptor(unittest.TestCase):

diff --git a/Lib/test/test_pydoc.py b/Lib/test/test_pydoc.py
@@ -123,7 +123,7 @@ class C(builtins.object)
     c_alias = test.pydoc_mod.C[int]
     list_alias1 = typing.List[int]
     list_alias2 = list[int]
-    type_union1 = typing.Union[int, str]
+    type_union1 = int | str
     type_union2 = int | str
 
 VERSION
@@ -208,7 +208,7 @@ class C(builtins.object)
     c_alias = test.pydoc_mod.C[int]
     list_alias1 = typing.List[int]
     list_alias2 = list[int]
-    type_union1 = typing.Union[int, str]
+    type_union1 = int | str
     type_union2 = int | str
 
 Author
@@ -1055,17 +1055,17 @@ def test_generic_alias(self):
         self.assertIn(list.__doc__.strip().splitlines()[0], doc)
 
     def test_union_type(self):
-        self.assertEqual(pydoc.describe(typing.Union[int, str]), '_UnionGenericAlias')
+        self.assertEqual(pydoc.describe(typing.Union[int, str]), 'UnionType')
         doc = pydoc.render_doc(typing.Union[int, str], renderer=pydoc.plaintext)
-        self.assertIn('_UnionGenericAlias in module typing', doc)
-        self.assertIn('Union = typing.Union', doc)
+        self.assertIn('UnionType in module types', doc)
+        self.assertIn('class UnionType(builtins.object)', doc)
         if typing.Union.__doc__:
             self.assertIn(typing.Union.__doc__.strip().splitlines()[0], doc)
 
         self.assertEqual(pydoc.describe(int | str), 'UnionType')
         doc = pydoc.render_doc(int | str, renderer=pydoc.plaintext)
-        self.assertIn('UnionType in module types object', doc)
-        self.assertIn('\nclass UnionType(builtins.object)', doc)
+        self.assertIn('UnionType in module types', doc)
+        self.assertIn('class UnionType(builtins.object)', doc)
         self.assertIn(types.UnionType.__doc__.strip().splitlines()[0], doc)
 
     def test_special_form(self):