Skip to content

[3.11] gh-103054: typing: Improve Callable type substitution tests (GH-103055) #103105

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
miss-islington merged 1 commit into from
Mar 29, 2023
Merged

[3.11] gh-103054: typing: Improve Callable type substitution tests (GH-103055) #103105

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
gh-103054: typing: Improve Callable type substitution tests (GH-103055 
)

(cherry picked from commit 60bdc16)

Co-authored-by: Nikita Sobolev <mail@sobolevn.me>
Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
Co-authored-by: Eclips4 <80244920+Eclips4@users.noreply.github.com>
  • Loading branch information
@sobolevn @AlexWaygood
@Eclips4 @miss-islington
3 people authored and miss-islington committed Mar 29, 2023
commit 8e06aa8996006fb2bbcb9e26dc084f8846c3e417
42 changes: 42 additions & 0 deletions Lib/test/test_typing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2044,6 +2044,48 @@ def test_concatenate(self):
Callable[Concatenate[int, str, P2], int])
self.assertEqual(C[...], Callable[Concatenate[int, ...], int])

def test_nested_paramspec(self):
# Since Callable has some special treatment, we want to be sure
# that substituion works correctly, see gh-103054
Callable = self.Callable
P = ParamSpec('P')
P2 = ParamSpec('P2')
T = TypeVar('T')
T2 = TypeVar('T2')
Ts = TypeVarTuple('Ts')
class My(Generic[P, T]):
pass

self.assertEqual(My.__parameters__, (P, T))

C1 = My[[int, T2], Callable[P2, T2]]
self.assertEqual(C1.__args__, ((int, T2), Callable[P2, T2]))
self.assertEqual(C1.__parameters__, (T2, P2))
self.assertEqual(C1[str, [list[int], bytes]],
My[[int, str], Callable[[list[int], bytes], str]])

C2 = My[[Callable[[T2], int], list[T2]], str]
self.assertEqual(C2.__args__, ((Callable[[T2], int], list[T2]), str))
self.assertEqual(C2.__parameters__, (T2,))
self.assertEqual(C2[list[str]],
My[[Callable[[list[str]], int], list[list[str]]], str])

C3 = My[[Callable[P2, T2], T2], T2]
self.assertEqual(C3.__args__, ((Callable[P2, T2], T2), T2))
self.assertEqual(C3.__parameters__, (P2, T2))
self.assertEqual(C3[[], int],
My[[Callable[[], int], int], int])
self.assertEqual(C3[[str, bool], int],
My[[Callable[[str, bool], int], int], int])
self.assertEqual(C3[[str, bool], T][int],
My[[Callable[[str, bool], int], int], int])

C4 = My[[Callable[[int, *Ts, str], T2], T2], T2]
self.assertEqual(C4.__args__, ((Callable[[int, *Ts, str], T2], T2), T2))
self.assertEqual(C4.__parameters__, (Ts, T2))
self.assertEqual(C4[bool, bytes, float],
My[[Callable[[int, bool, bytes, str], float], float], float])

def test_errors(self):
Callable = self.Callable
alias = Callable[[int, str], float]
Expand Down