Skip to content

bpo-44796: Unify TypeVar and ParamSpec substitution #31143

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 4 commits into from
Mar 11, 2022
Merged

bpo-44796: Unify TypeVar and ParamSpec substitution #31143

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a03c0d1
bpo-44796: Unify TypeVar and ParamSpec substitution
serhiy-storchaka Feb 4, 2022
af9a60c
Merge branch 'main' into typevar-subst2
serhiy-storchaka Feb 6, 2022
e4345da
Merge branch 'main' into typevar-subst2
serhiy-storchaka Mar 10, 2022
845676d
Merge branch 'main' into typevar-subst2
serhiy-storchaka Mar 10, 2022
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
Merge branch 'main' into typevar-subst2
  • Loading branch information
@serhiy-storchaka
serhiy-storchaka committed Mar 10, 2022
commit 845676d087b6df4dcb17907159cac18d697daebd
6 changes: 0 additions & 6 deletions Lib/typing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -674,7 +674,6 @@ def Concatenate(self, parameters):
msg = "Concatenate[arg, ...]: each arg must be a type."
parameters = (*(_type_check(p, msg) for p in parameters[:-1]), parameters[-1])
return _ConcatenateGenericAlias(self, parameters,
_typevar_types=(TypeVar, ParamSpec),
_paramspec_tvars=True)


Expand Down Expand Up @@ -1353,7 +1352,6 @@ def _determine_new_args(self, args):

def copy_with(self, args):
return self.__class__(self.__origin__, args, name=self._name, inst=self._inst,
_typevar_types=self._typevar_types,
_paramspec_tvars=self._paramspec_tvars)

def __repr__(self):
Expand Down Expand Up @@ -1562,10 +1560,6 @@ def __hash__(self):


class _ConcatenateGenericAlias(_GenericAlias, _root=True):
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs,
_paramspec_tvars=True)

def copy_with(self, params):
if isinstance(params[-1], (list, tuple)):
return (*params[:-1], *params[-1])
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.