https://github.com/python/cpython/commit/aac6b019fe91e2f9f7a955d4fc4db5d5efd968c9
commit: aac6b019fe91e2f9f7a955d4fc4db5d5efd968c9
branch: main
author: Jelle Zijlstra <[email protected]>
committer: JelleZijlstra <[email protected]>
date: 2024-05-08T09:54:51-07:00
summary:
gh-118772: Allow TypeVars without a default to follow those with a default when
constructing aliases (#118774)
files:
A Misc/NEWS.d/next/Library/2024-05-08-09-21-49.gh-issue-118772.c16E8X.rst
M Lib/test/test_typing.py
M Lib/typing.py
diff --git a/Lib/test/test_typing.py b/Lib/test/test_typing.py
index bd116bb1ab7213..fff81f7997764d 100644
--- a/Lib/test/test_typing.py
+++ b/Lib/test/test_typing.py
@@ -668,6 +668,23 @@ class X(Generic[*Ts, T]): ...
with self.assertRaises(TypeError):
class Y(Generic[*Ts_default, T]): ...
+ def test_allow_default_after_non_default_in_alias(self):
+ T_default = TypeVar('T_default', default=int)
+ T = TypeVar('T')
+ Ts = TypeVarTuple('Ts')
+
+ a1 = Callable[[T_default], T]
+ self.assertEqual(a1.__args__, (T_default, T))
+
+ a2 = dict[T_default, T]
+ self.assertEqual(a2.__args__, (T_default, T))
+
+ a3 = typing.Dict[T_default, T]
+ self.assertEqual(a3.__args__, (T_default, T))
+
+ a4 = Callable[*Ts, T]
+ self.assertEqual(a4.__args__, (*Ts, T))
+
def test_paramspec_specialization(self):
T = TypeVar("T")
P = ParamSpec('P', default=[str, int])
diff --git a/Lib/typing.py b/Lib/typing.py
index 8e61f50477bcc2..c8649e312ddb00 100644
--- a/Lib/typing.py
+++ b/Lib/typing.py
@@ -257,7 +257,7 @@ def _type_repr(obj):
return repr(obj)
-def _collect_parameters(args):
+def _collect_parameters(args, *, enforce_default_ordering: bool = True):
"""Collect all type variables and parameter specifications in args
in order of first appearance (lexicographic order).
@@ -286,15 +286,16 @@ def _collect_parameters(args):
parameters.append(collected)
elif hasattr(t, '__typing_subst__'):
if t not in parameters:
- if type_var_tuple_encountered and t.has_default():
- raise TypeError('Type parameter with a default'
- ' follows TypeVarTuple')
+ if enforce_default_ordering:
+ if type_var_tuple_encountered and t.has_default():
+ raise TypeError('Type parameter with a default'
+ ' follows TypeVarTuple')
- if t.has_default():
- default_encountered = True
- elif default_encountered:
- raise TypeError(f'Type parameter {t!r} without a default'
- ' follows type parameter with a default')
+ if t.has_default():
+ default_encountered = True
+ elif default_encountered:
+ raise TypeError(f'Type parameter {t!r} without a
default'
+ ' follows type parameter with a
default')
parameters.append(t)
else:
@@ -1416,7 +1417,11 @@ def __init__(self, origin, args, *, inst=True,
name=None):
args = (args,)
self.__args__ = tuple(... if a is _TypingEllipsis else
a for a in args)
- self.__parameters__ = _collect_parameters(args)
+ enforce_default_ordering = origin in (Generic, Protocol)
+ self.__parameters__ = _collect_parameters(
+ args,
+ enforce_default_ordering=enforce_default_ordering,
+ )
if not name:
self.__module__ = origin.__module__
diff --git
a/Misc/NEWS.d/next/Library/2024-05-08-09-21-49.gh-issue-118772.c16E8X.rst
b/Misc/NEWS.d/next/Library/2024-05-08-09-21-49.gh-issue-118772.c16E8X.rst
new file mode 100644
index 00000000000000..474454b36da956
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2024-05-08-09-21-49.gh-issue-118772.c16E8X.rst
@@ -0,0 +1,2 @@
+Allow :class:`typing.TypeVar` instances without a default to follow
+instances without a default in some cases. Patch by Jelle Zijlstra.
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]
