10000 gh-88965: Fix type substitution of a list of types after initial `ParamSpec` substitution by sobolevn · Pull Request #102808 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content
8000

gh-88965: Fix type substitution of a list of types after initial ParamSpec substitution #102808

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
merged 5 commits into from
Mar 23, 2023
Merged

gh-88965: Fix type substitution of a list of types after initial ParamSpec substitution #102808

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
55662cc
gh-88965: Fix type substitution of a list of types after initial `Pa…
sobolevn Mar 18, 2023
d33bfca
Add more tests and address review
sobolevn Mar 20, 2023
0bbcd1b
Merge branch 'main' into issue-88965
sobolevn Mar 21, 2023
30dc918
More expansive news entry
AlexWaygood Mar 23, 2023
b01e6a6
Merge branch 'main' into issue-88965
AlexWaygood Mar 23, 2023
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
Add more tests and address review
  • Loading branch information
@sobolevn
sobolevn committed Mar 20, 2023
commit d33bfca06a0d307463541488e276788802d3425e
56 changes: 56 additions & 0 deletions Lib/test/test_typing.py
View file
Open in desktop
10000
Original file line number Diff line number Diff line change
Expand Up @@ -7744,6 +7744,62 @@ class Base(Generic[P]):
self.assertEqual(A10.__args__, (P2,))
self.assertEqual(A10[[int, str]], Base[[int, str]])

class DoubleP(Generic[P, P2]):
pass

B1 = DoubleP[P, P2]
self.assertEqual(B1.__parameters__, (P, P2))
self.assertEqual(B1.__args__, (P, P2))
self.assertEqual(B1[[int, str], [bool]], DoubleP[[int, str], [bool]])
self.assertEqual(B1[[], []], DoubleP[[], []])

B2 = DoubleP[[int, str], P2]
self.assertEqual(B2.__parameters__, (P2,))
self.assertEqual(B2.__args__, ((int, str), P2))
self.assertEqual(B2[[bool, bool]], DoubleP[[int, str], [bool, bool]])
self.assertEqual(B2[[]], DoubleP[[int, str], []])

B3 = DoubleP[P, [bool, bool]]
self.assertEqual(B3.__parameters__, (P,))
self.assertEqual(B3.__args__, (P, (bool, bool)))
self.assertEqual(B3[[int, str]], DoubleP[[int, str], [bool, bool]])
self.assertEqual(B3[[]], DoubleP[[], [bool, bool]])

B4 = DoubleP[[T, int], [bool, T2]]
self.assertEqual(B4.__parameters__, (T, T2))
self.assertEqual(B4.__args__, ((T, int), (bool, T2)))
self.assertEqual(B4[str, float], DoubleP[[str, int], [bool, float]])

B5 = DoubleP[[*Ts, int], [bool, T2]]
self.assertEqual(B5.__parameters__, (Ts, T2))
self.assertEqual(B5.__args__, ((*Ts, int), (bool, T2)))
self.assertEqual(B5[str, bytes, float],
DoubleP[[str, bytes, int], [bool, float]])

B6 = DoubleP[[T, int], [bool, *Ts]]
self.assertEqual(B6.__parameters__, (T, Ts))
self.assertEqual(B6.__args__, ((T, int), (bool, *Ts)))
self.assertEqual(B6[str, bytes, float],
DoubleP[[str, int], [bool, bytes, float]])

class PandT(Generic[P, T]):
pass

C1 = PandT[P, T]
self.assertEqual(C1.__parameters__, (P, T))
self.assertEqual(C1.__args__, (P, T))
self.assertEqual(C1[[int, str], bool], PandT[[int, str], bool])

C2 = PandT[[int, T], T]
self.assertEqual(C2.__parameters__, (T,))
self.assertEqual(C2.__args__, ((int, T), T))
self.assertEqual(C2[str], PandT[[int, str], str])

C3 = PandT[[int, *Ts], T]
self.assertEqual(C3.__parameters__, (Ts, T))
self.assertEqual(C3.__args__, ((int, *Ts), T))
self.assertEqual(C3[str, bool, bytes], PandT[[int, str, bool], bytes])

def test_paramspec_in_nested_generics(self):
# Although ParamSpec should not be found in __parameters__ of most
# generics, they probably should be found when nested in
Expand Down
135 changes: 65 additions & 70 deletions Lib/typing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,20 +255,17 @@ def _collect_parameters(args):
"""
parameters = []
for t in args:
# We don't want __parameters__ descriptor of a bare Python class.
if isinstance(t, type):
continue

# `t` might be a tuple, when `ParamSpec` is substituted with
# `[T, int]`, or `[int, *Ts]`, etc.
if isinstance(t, tuple):
# We don't want __parameters__ descriptor of a bare Python class.
pass
elif isinstance(t, tuple):
# `t` might be a tuple, when `ParamSpec` is substituted with
# `[T, int]`, or `[int, *Ts]`, etc.
for x in t:
for collected in _collect_parameters([x]):
if collected not in parameters:
parameters.append(collected)
continue

if hasattr(t, '__typing_subst__'):
elif hasattr(t, '__typing_subst__'):
if t not in parameters:
parameters.append(t)
else:
Expand Down Expand Up @@ -1451,71 +1448,69 @@ def _determine_new_args(self, args):
raise TypeError(f"Too {'many' if alen > plen else 'few'} arguments for {self};"
f" actual {alen}, expected {plen}")
new_arg_by_param = dict(zip(params, args))
return tuple(self._make_substitution(self.__args__, new_arg_by_param))

def _make_substitution(self, args, new_arg_by_param):
"""Create a list of n 10000 ew type arguments."""
new_args = []
for old_arg in self.__args__:
self._make_substitution(old_arg, new_args, new_arg_by_param)
return tuple(new_args)

def _make_substitution(self, old_arg, new_args, new_arg_by_param):
# Mutates `new_args` and inserts the correct new argument.
if isinstance(old_arg, type):
new_args.append(old_arg)
return
for old_arg in args:
if isinstance(old_arg, type):
new_args.append(old_arg)
continue

substfunc = getattr(old_arg, '__typing_subst__', None)
if substfunc:
new_arg = substfunc(new_arg_by_param[old_arg])
else:
subparams = getattr(old_arg, '__parameters__', ())
if not subparams:
new_arg = old_arg
substfunc = getattr(old_arg, '__typing_subst__', None)
if substfunc:
new_arg = substfunc(new_arg_by_param[old_arg])
else:
subargs = []
for x in subparams:
if isinstance(x, TypeVarTuple):
subargs.extend(new_arg_by_param[x])
else:
subargs.append(new_arg_by_param[x])
new_arg = old_arg[tuple(subargs)]

if self.__origin__ == collections.abc.Callable and isinstance(new_arg, tuple):
# Consider the following `Callable`.
# C = Callable[[int], str]
# Here, `C.__args__` should be (int, str) - NOT ([int], str).
# That means that if we had something like...
# P = ParamSpec('P')
# T = TypeVar('T')
# C = Callable[P, T]
# D = C[[int, str], float]
# ...we need to be careful; `new_args` should end up as
# `(int, str, float)` rather than `([int, str], float)`.
new_args.extend(new_arg)
elif _is_unpacked_typevartuple(old_arg):
# Consider the following `_GenericAlias`, `B`:
# class A(Generic[*Ts]): ...
# B = A[T, *Ts]
# If we then do:
# B[float, int, str]
# The `new_arg` corresponding to `T` will be `float`, and the
# `new_arg` corresponding to `*Ts` will be `(int, str)`. We
# should join all these types together in a flat list
# `(float, int, str)` - so again, we should `extend`.
new_args.extend(new_arg)
elif isinstance(old_arg, tuple):
# Corner case:
# P = ParamSpec('P')
# T = TypeVar('T')
# class Base(Generic[P]): ...
# Can be substituted like this:
# X = Base[[int, T]]
# In this case, `old_arg` will be a tuple:
sub_args = []
for x in old_arg:
self._make_substitution(x, sub_args, new_arg_by_param)
new_args.append(tuple(sub_args))
else:
new_args.append(new_arg)
subparams = getattr(old_arg, '__parameters__', ())
if not subparams:
new_arg = old_arg
else:
subargs = []
for x in subparams:
if isinstance(x, TypeVarTuple):
subargs.extend(new_arg_by_param[x])
else:
subargs.append(new_arg_by_param[x])
new_arg = old_arg[tuple(subargs)]

if self.__origin__ == collections.abc.Callable and isinstance(new_arg, tuple):
# Consider the following `Callable`.
# C = Callable[[int], str]
# Here, `C.__args__` should be (int, str) - NOT ([int], str).
# That means that if we had something like...
# P = ParamSpec('P')
# T = TypeVar('T')
# C = Callable[P, T]
# D = C[[int, str], float]
# ...we need to be careful; `new_args` should end up as
# `(int, str, float)` rather than `([int, str], float)`.
new_args.extend(new_arg)
elif _is_unpacked_typevartuple(old_arg):
# Consider the following `_GenericAlias`, `B`:
# class A(Generic[*Ts]): ...
# B = A[T, *Ts]
# If we then do:
# B[float, int, str]
# The `new_arg` corresponding to `T` will be `float`, and the
# `new_arg` corresponding to `*Ts` will be `(int, str)`. We
# should join all these types together in a flat list
# `(float, int, str)` - so again, we should `extend`.
new_args.extend(new_arg)
elif isinstance(old_arg, tuple):
# Corner case:
# P = ParamSpec('P')
# T = TypeVar('T')
# class Base(Generic[P]): ...
# Can be substituted like this:
# X = Base[[int, T]]
# In this case, `old_arg` will 566D be a tuple:
new_args.append(
tuple(self._make_substitution(old_arg, new_arg_by_param)),
)
else:
new_args.append(new_arg)
return new_args

def copy_with(self, args):
return self.__class__(self.__origin__, args, name=self._name, inst=self._inst,
Expand Down
0