From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Tue, 30 Aug 2022 10:58:54 +0000 (-0700)
Subject: gh-96385: Correctly raise error on `[*T, *V]` substitution (GH-96386) (#96407)
X-Git-Tag: v3.11.0rc2~47
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=16d8948c31537355f64f38de4f4ebc4ef5b9e7b8;p=thirdparty%2FPython%2Fcpython.git

gh-96385: Correctly raise error on `[*T, *V]` substitution (GH-96386) (#96407)

(cherry picked from commit 75177358a62afeabd1d3aa0e9f395c2b9d4495ca)

Co-authored-by: Nikita Sobolev <mail@sobolevn.me>

Co-authored-by: Nikita Sobolev <mail@sobolevn.me>
---

diff --git a/Lib/test/test_typing.py b/Lib/test/test_typing.py
index 2fd57822726e..776a6f003c06 100644
--- a/Lib/test/test_typing.py
+++ b/Lib/test/test_typing.py
@@ -591,6 +591,7 @@ class GenericAliasSubstitutionTests(BaseTestCase):
     def test_one_parameter(self):
         T = TypeVar('T')
         Ts = TypeVarTuple('Ts')
+        Ts2 = TypeVarTuple('Ts2')
 
         class C(Generic[T]): pass
 
@@ -616,6 +617,8 @@ class GenericAliasSubstitutionTests(BaseTestCase):
             # Should definitely raise TypeError: list only takes one argument.
             ('list[T, *tuple_type[int, ...]]',    '[int]',                   'list[int, *tuple_type[int, ...]]'),
             ('List[T, *tuple_type[int, ...]]',    '[int]',                   'TypeError'),
+            # Should raise, because more than one `TypeVarTuple` is not supported.
+            ('generic[*Ts, *Ts2]',                '[int]',                   'TypeError'),
         ]
 
         for alias_template, args_template, expected_template in tests:
diff --git a/Lib/typing.py b/Lib/typing.py
index 9d6babefe6c2..354976caaaa0 100644
--- a/Lib/typing.py
+++ b/Lib/typing.py
@@ -1071,7 +1071,7 @@ class TypeVarTuple(_Final, _Immutable, _PickleUsingNameMixin, _root=True):
     def __typing_prepare_subst__(self, alias, args):
         params = alias.__parameters__
         typevartuple_index = params.index(self)
-        for param in enumerate(params[typevartuple_index + 1:]):
+        for param in params[typevartuple_index + 1:]:
             if isinstance(param, TypeVarTuple):
                 raise TypeError(f"More than one TypeVarTuple parameter in {alias}")
 
diff --git a/Misc/NEWS.d/next/Library/2022-08-29-15-28-39.gh-issue-96385.uLRTsf.rst b/Misc/NEWS.d/next/Library/2022-08-29-15-28-39.gh-issue-96385.uLRTsf.rst
new file mode 100644
index 000000000000..57354826f349
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2022-08-29-15-28-39.gh-issue-96385.uLRTsf.rst
@@ -0,0 +1,3 @@
+Fix ``TypeVarTuple.__typing_prepare_subst__``. ``TypeError`` was not raised
+when using more than one ``TypeVarTuple``, like ``[*T, *V]`` in type alias
+substitutions.