mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-14 20:56:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

bpo-44490: Improve typing module compatibility with types.Union (GH-27048) (#27222)

Browse source 
(cherry picked from commit bf89ff96e6)

Co-authored-by: Yurii Karabas <1998uriyyo@gmail.com>
This commit is contained in:
Ken Jin 2021-07-19 22:22:59 +08:00 • committed by GitHub
parent 37bdd2221c
commit a272164959
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 40 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Lib/typing.py
View file

@ -195,7 +195,7 @@ def _type_repr(obj):
return repr(obj)
def _collect_type_vars(types, typevar_types=None):
def _collect_type_vars(types_, typevar_types=None):
"""Collect all type variable contained
in types in order of first appearance (lexicographic order). For example::
@ -204,10 +204,10 @@ def _collect_type_vars(types, typevar_types=None):
if typevar_types is None:
typevar_types = TypeVar
tvars = []
for t in types:
for t in types_:
if isinstance(t, typevar_types) and t not in tvars:
tvars.append(t)
if isinstance(t, (_GenericAlias, GenericAlias)):
if isinstance(t, (_GenericAlias, GenericAlias, types.Union)):
tvars.extend([t for t in t.__parameters__ if t not in tvars])
return tuple(tvars)
@ -314,12 +314,14 @@ def _eval_type(t, globalns, localns, recursive_guard=frozenset()):
"""
if isinstance(t, ForwardRef):
return t._evaluate(globalns, localns, recursive_guard)
if isinstance(t, (_GenericAlias, GenericAlias)):
if isinstance(t, (_GenericAlias, GenericAlias, types.Union)):
ev_args = tuple(_eval_type(a, globalns, localns, recursive_guard) for a in t.__args__)
if ev_args == t.__args__:
return t
if isinstance(t, GenericAlias):
return GenericAlias(t.__origin__, ev_args)
if isinstance(t, types.Union):
return functools.reduce(operator.or_, ev_args)
else:
return t.copy_with(ev_args)
return t
@ -1013,7 +1015,7 @@ class _GenericAlias(_BaseGenericAlias, _root=True):
for arg in self.__args__:
if isinstance(arg, self._typevar_types):
arg = subst[arg]
elif isinstance(arg, (_GenericAlias, GenericAlias)):
elif isinstance(arg, (_GenericAlias, GenericAlias, types.Union)):
subparams = arg.__parameters__
if subparams:
subargs = tuple(subst[x] for x in subparams)
@ -1779,6 +1781,12 @@ def _strip_annotations(t):
if stripped_args == t.__args__:
return t
return GenericAlias(t.__origin__, stripped_args)
if isinstance(t, types.Union):
stripped_args = tuple(_strip_annotations(a) for a in t.__args__)
if stripped_args == t.__args__:
return t
return functools.reduce(operator.or_, stripped_args)
return t