Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions test_typing_inspect.py
Original file line number Diff line number Diff line change
Expand Up @@ -355,6 +355,7 @@ def test_origin(self):
if GENERIC_TUPLE_PARAMETRIZABLE:
tp = List[Tuple[T, T]][int]
self.assertEqual(get_origin(tp), list if NEW_TYPING else List)
self.assertIs(get_origin(Union[str, int]), typing.Union)

def test_parameters(self):
T = TypeVar('T')
Expand Down
8 changes: 7 additions & 1 deletion typing_inspect.py
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,13 @@ def get_origin(tp):
get_origin(List[Tuple[T, T]][int]) == list # List prior to Python 3.7
"""
if NEW_TYPING:
if isinstance(tp, typingGenericAlias):
if (
isinstance(tp, typingGenericAlias) or
# In Python 3.14, Union[...] is not an instance of
# typingGenericAlias, but it does have an `__origin__`, so check for
# Unions explicitly.
is_union_type(tp)
):
return tp.__origin__ if tp.__origin__ is not ClassVar else None
if tp is Generic:
return Generic
Expand Down