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
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
Refactor __reduce__.
  • Loading branch information
@serhiy-storchaka
serhiy-storchaka committed May 2, 2020
commit 5431d6d9bc89e2ed8718e81a29c65f6f38a4662e
16 changes: 9 additions & 7 deletions Lib/typing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -721,13 +721,9 @@ def __reduce__(self):
origin = globals()[self._name]
else:
origin = self.__origin__
if (origin is Callable and
not (len(self.__args__) == 2 and self.__args__[0] is Ellipsis)):
args = list(self.__args__[:-1]), self.__args__[-1]
else:
args = tuple(self.__args__)
if len(args) == 1 and not isinstance(args[0], tuple):
args, = args
args = tuple(self.__args__)
if len(args) == 1 and not isinstance(args[0], tuple):
args, = args
return operator.getitem, (origin, args)

def __mro_entries__(self, bases):
Expand Down Expand Up @@ -787,6 +783,12 @@ def __repr__(self):
f'[[{", ".join([_type_repr(a) for a in self.__args__[:-1]])}], '
f'{_type_repr(self.__args__[-1])}]')

def __reduce__(self):
args = self.__args__
if not (len(args) == 2 and args[0] is ...):
args = list(args[:-1]), args[-1]
return operator.getitem, (Callable, args)


class _CallableType(_SpecialGenericAlias, _root=True):
def copy_with(self, params):
Expand Down