Skip to content

Allow subscription of Callable[Concatenate[P], Any] with ellipsis in Python 3.10 #478

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

Closed
wants to merge 2 commits into from
Closed

Allow subscription of Callable[Concatenate[P], Any] with ellipsis in Python 3.10 #478

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d0c9aa3
Patch 3.10 Concatenate to support ellipsis
Daraan Oct 3, 2024
2082ace
remove whitespace
Daraan Oct 3, 2024
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
12 changes: 12 additions & 0 deletions src/test_typing_extensions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5401,6 +5401,18 @@ def test_invalid_uses(self):
):
Concatenate[1, P]

@skipUnless(TYPING_3_10_0, "Missing backported to <=3.9. See issue #48")
def test_alias_subscription_with_ellipsis(self):
P = ParamSpec('P')
X = Callable[Concatenate[int, P], Any]

C1 = X[...]
self.assertEqual(C1.__parameters__, ())
with self.subTest("Compare Concatenate[int, ...]"):
if sys.version_info[:2] == (3, 10):
self.skipTest("Needs Issue #110 | PR # 442: construct Concatenate with ...")
self.assertEqual(get_args(C1), (Concatenate[int, ...], Any))

def test_basic_introspection(self):
P = ParamSpec('P')
C1 = Concatenate[int, P]
Expand Down
17 changes: 17 additions & 0 deletions src/typing_extensions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1795,7 +1795,24 @@ def __parameters__(self):
return tuple(
tp for tp in self.__args__ if isinstance(tp, (typing.TypeVar, ParamSpec))
)
# 3.10+
else:
_ConcatenateGenericAlias = typing._ConcatenateGenericAlias

# 3.10
# Monkey patch to not raise TypeError on python3.10 for ellipsis parameter
if sys.version_info < (3, 11):
def _copy_with_support_ellipsis(self, params):
if isinstance(params[-1], (list, tuple)):
return (*params[:-1], *params[-1])
if isinstance(params[-1], _ConcatenateGenericAlias):
params = (*params[:-1], *params[-1].__args__)
elif not (params[-1] is ... or isinstance(params[-1], ParamSpec)):
raise TypeError("The last parameter to Concatenate should be a "
"ParamSpec variable or ellipsis.")
return super(_ConcatenateGenericAlias, self).copy_with(params)

_ConcatenateGenericAlias.copy_with = _copy_with_support_ellipsis

# 3.8-3.9
@typing._tp_cache
Expand Down
Loading