Skip to content

bpo-40397: Refactor typing._GenericAlias #19719

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
serhiy-storchaka merged 8 commits into from
May 7, 2020
+198 −191
Merged

bpo-40397: Refactor typing._GenericAlias #19719

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c692181
bpo-40397: Refactor typing._GenericAlias
serhiy-storchaka Apr 26, 2020
e626caf
Merge branch 'master' into refactor-typing-generic-alias
serhiy-storchaka Apr 26, 2020
f18888a
Merge branch 'master' into refactor-typing-generic-alias
serhiy-storchaka May 2, 2020
26d44c3
Add _UnionGenericAlias.
serhiy-storchaka May 2, 2020
ee37e56
Refactor __getitem__.
serhiy-storchaka May 2, 2020
f1c1e17
Minor refactoring.
serhiy-storchaka May 2, 2020
5431d6d
Refactor __reduce__.
serhiy-storchaka May 2, 2020
f671199
Merge branch 'master' into refactor-typing-generic-alias
serhiy-storchaka May 4, 2020
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
Prev Previous commit
Next Next commit
Minor refactoring.
  • Loading branch information
@serhiy-storchaka
serhiy-storchaka committed May 2, 2020
commit f1c1e17958265dc5bca9c9974a885f8b39fa60aa
16 changes: 7 additions & 9 deletions Lib/typing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ def _collect_type_vars(types):
for t in types:
if isinstance(t, TypeVar) and t not in tvars:
tvars.append(t)
if isinstance(t, _GenericAlias) or isinstance(t, GenericAlias):
if isinstance(t, (_GenericAlias, GenericAlias)):
tvars.extend([t for t in t.__parameters__ if t not in tvars])
return tuple(tvars)

Expand Down Expand Up @@ -251,16 +251,14 @@ def _eval_type(t, globalns, localns):
"""
if isinstance(t, ForwardRef):
return t._evaluate(globalns, localns)
if isinstance(t, _GenericAlias):
ev_args = tuple(_eval_type(a, globalns, localns) for a in t.__args__)
if ev_args == t.__args__:
return t
return t.copy_with(ev_args)
if isinstance(t, GenericAlias):
if isinstance(t, (_GenericAlias, GenericAlias)):
ev_args = tuple(_eval_type(a, globalns, localns) for a in t.__args__)
if ev_args == t.__args__:
return t
return GenericAlias(t.__origin__, ev_args)
if isinstance(t, GenericAlias):
return GenericAlias(t.__origin__, ev_args)
else:
return t.copy_with(ev_args)
return t


Expand Down Expand Up @@ -1435,7 +1433,7 @@ def get_args(tp):
"""
if isinstance(tp, _AnnotatedAlias):
return (tp.__origin__,) + tp.__metadata__
if isinstance(tp, (_GenericAlias, GenericAlias)):
if isinstance(tp, _GenericAlias):
res = tp.__args__
if tp.__origin__ is collections.abc.Callable and res[0] is not Ellipsis:
res = (list(res[:-1]), res[-1])
Expand Down