diff options
| author | Jelle Zijlstra <jelle.zijlstra@gmail.com> | 2025-03-04 19:44:19 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-03-04 19:44:19 (GMT) |
| commit | dc6d66f44c0a25b69dfec7e4ffc4a6fa5e4feada (patch) | |
| tree | 045fed4b7965d56ea45c009dad6dddb42d7be8b0 /Lib/test/test_pydoc/test_pydoc.py | |
| parent | e091520fdbcfe406e5fdcf66b7864b2b34a6726b (diff) | |
| download | cpython-dc6d66f44c0a25b69dfec7e4ffc4a6fa5e4feada.zip cpython-dc6d66f44c0a25b69dfec7e4ffc4a6fa5e4feada.tar.gz cpython-dc6d66f44c0a25b69dfec7e4ffc4a6fa5e4feada.tar.bz2 | |
gh-105499: Merge typing.Union and types.UnionType (#105511)
Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
Co-authored-by: Ken Jin <kenjin@python.org>
Co-authored-by: Carl Meyer <carl@oddbird.net>
Diffstat (limited to 'Lib/test/test_pydoc/test_pydoc.py')
| -rw-r--r-- | Lib/test/test_pydoc/test_pydoc.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Lib/test/test_pydoc/test_pydoc.py b/Lib/test/test_pydoc/test_pydoc.py index 0abd36c..2b1a448 100644 --- a/Lib/test/test_pydoc/test_pydoc.py +++ b/Lib/test/test_pydoc/test_pydoc.py @@ -133,7 +133,7 @@ DATA c_alias = test.test_pydoc.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 @@ -223,7 +223,7 @@ Data c_alias = test.test_pydoc.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 @@ -1447,17 +1447,17 @@ class TestDescriptions(unittest.TestCase): 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]), 'Union') 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('Union in module typing', doc) + self.assertIn('class Union(builtins.object)', doc) if typing.Union.__doc__: self.assertIn(typing.Union.__doc__.strip().splitlines()[0], doc) - self.assertEqual(pydoc.describe(int | str), 'UnionType') + self.assertEqual(pydoc.describe(int | str), 'Union') 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('Union in module typing', doc) + self.assertIn('class Union(builtins.object)', doc) if not MISSING_C_DOCSTRINGS: self.assertIn(types.UnionType.__doc__.strip().splitlines()[0], doc) |