[3.13] gh-118814: Fix the TypeVar constructor when name is passed by …

…keyword (GH-122664) (GH-122806)

Fix _PyArg_UnpackKeywordsWithVararg for the case when argument for
positional-or-keyword parameter is passed by keyword.
There was only one such case in the stdlib -- the TypeVar constructor.
(cherry picked from commit 540fcc6)

Lib/test/test_clinic.py

@@ -3334,11 +3334,27 @@ def test_vararg(self):
  self.assertEqual(ac_tester.vararg(1, 2, 3, 4), (1, (2, 3, 4)))
 
  def test_vararg_with_default(self):
- with self.assertRaises(TypeError):
- ac_tester.vararg_with_default()
- self.assertEqual(ac_tester.vararg_with_default(1, b=False), (1, (), False))
- self.assertEqual(ac_tester.vararg_with_default(1, 2, 3, 4), (1, (2, 3, 4), False))
- self.assertEqual(ac_tester.vararg_with_default(1, 2, 3, 4, b=True), (1, (2, 3, 4), True))
+ fn = ac_tester.vararg_with_default
+ self.assertRaises(TypeError, fn)
+ self.assertRaises(TypeError, fn, 1, a=2)
+ self.assertEqual(fn(1, b=2), (1, (), True))
+ self.assertEqual(fn(1, 2, 3, 4), (1, (2, 3, 4), False))
+ self.assertEqual(fn(1, 2, 3, 4, b=5), (1, (2, 3, 4), True))
+ self.assertEqual(fn(a=1), (1, (), False))
+ self.assertEqual(fn(a=1, b=2), (1, (), True))
+
+ def test_vararg_with_default2(self):
+ fn = ac_tester.vararg_with_default2
+ self.assertRaises(TypeError, fn)
+ self.assertRaises(TypeError, fn, 1, a=2)
+ self.assertEqual(fn(1, b=2), (1, (), 2, None))
+ self.assertEqual(fn(1, b=2, c=3), (1, (), 2, 3))
+ self.assertEqual(fn(1, 2, 3), (1, (2, 3), None, None))
+ self.assertEqual(fn(1, 2, 3, b=4), (1, (2, 3), 4, None))
+ self.assertEqual(fn(1, 2, 3, b=4, c=5), (1, (2, 3), 4, 5))
+ self.assertEqual(fn(a=1), (1, (), None, None))
+ self.assertEqual(fn(a=1, b=2), (1, (), 2, None))
+ self.assertEqual(fn(a=1, b=2, c=3), (1, (), 2, 3))
 
  def test_vararg_with_only_defaults(self):
  self.assertEqual(ac_tester.vararg_with_only_defaults(), ((), None))

Lib/test/test_typing.py

@@ -578,6 +578,55 @@ def test_constructor(self):
  self.assertEqual(T.__name__, "T")
  self.assertEqual(T.__constraints__, ())
  self.assertIs(T.__bound__, None)
+ self.assertIs(T.__default__, typing.NoDefault)
+ self.assertIs(T.__covariant__, False)
+ self.assertIs(T.__contravariant__, False)
+ self.assertIs(T.__infer_variance__, False)
+
+ T = TypeVar(name="T", bound=type)
+ self.assertEqual(T.__name__, "T")
+ self.assertEqual(T.__constraints__, ())
+ self.assertIs(T.__bound__, type)
+ self.assertIs(T.__default__, typing.NoDefault)
+ self.assertIs(T.__covariant__, False)
+ self.assertIs(T.__contravariant__, False)
+ self.assertIs(T.__infer_variance__, False)
+
+ T = TypeVar(name="T", default=())
+ self.assertEqual(T.__name__, "T")
+ self.assertEqual(T.__constraints__, ())
+ self.assertIs(T.__bound__, None)
+ self.assertIs(T.__default__, ())
+ self.assertIs(T.__covariant__, False)
+ self.assertIs(T.__contravariant__, False)
+ self.assertIs(T.__infer_variance__, False)
+
+ T = TypeVar(name="T", covariant=True)
+ self.assertEqual(T.__name__, "T")
+ self.assertEqual(T.__constraints__, ())
+ self.assertIs(T.__bound__, None)
+ self.assertIs(T.__default__, typing.NoDefault)
+ self.assertIs(T.__covariant__, True)
+ self.assertIs(T.__contravariant__, False)
+ self.assertIs(T.__infer_variance__, False)
+
+ T = TypeVar(name="T", contravariant=True)
+ self.assertEqual(T.__name__, "T")
+ self.assertEqual(T.__constraints__, ())
+ self.assertIs(T.__bound__, None)
+ self.assertIs(T.__default__, typing.NoDefault)
+ self.assertIs(T.__covariant__, False)
+ self.assertIs(T.__contravariant__, True)
+ self.assertIs(T.__infer_variance__, False)
+
+ T = TypeVar(name="T", infer_variance=True)
+ self.assertEqual(T.__name__, "T")
+ self.assertEqual(T.__constraints__, ())
+ self.assertIs(T.__bound__, None)
+ self.assertIs(T.__default__, typing.NoDefault)
+ self.assertIs(T.__covariant__, False)
+ self.assertIs(T.__contravariant__, False)
+ self.assertIs(T.__infer_variance__, True)
 
 
 class TypeParameterDefaultsTests(BaseTestCase):

Misc/NEWS.d/next/Library/2024-08-04-14-07-18.gh-issue-118814.uiyks1.rst

@@ -0,0 +1 @@
+Fix the :class:`typing.TypeVar` constructor when name is passed by keyword.

Modules/_testclinic.c

@@ -1033,6 +1033,25 @@ vararg_with_default_impl(PyObject *module, PyObject *a, PyObject *args,
 }
 
 
+/*[clinic input]
+vararg_with_default2
+
+ a: object
+ *args: object
+ b: object = None
+ c: object = None
+
+[clinic start generated code]*/
+
+static PyObject *
+vararg_with_default2_impl(PyObject *module, PyObject *a, PyObject *args,
+ PyObject *b, PyObject *c)
+/*[clinic end generated code: output=a0fb7c37796e2129 input=59fb22f5f0a8925f]*/
+{
+ return pack_arguments_newref(4, a, args, b, c);
+}
+
+
 /*[clinic input]
 vararg_with_only_defaults
 
@@ -1907,6 +1926,7 @@ static PyMethodDef tester_methods[] = {
  VARARG_AND_POSONLY_METHODDEF
  VARARG_METHODDEF
  VARARG_WITH_DEFAULT_METHODDEF
+ VARARG_WITH_DEFAULT2_METHODDEF
  VARARG_WITH_ONLY_DEFAULTS_METHODDEF
  GH_32092_OOB_METHODDEF
  GH_32092_KW_PASS_METHODDEF

Python/getargs.c

@@ -2574,7 +2574,7 @@ _PyArg_UnpackKeywordsWithVararg(PyObject *const *args, Py_ssize_t nargs,
  *
  * Otherwise, we leave a place at `buf[vararg]` for vararg tuple
  * so the index is `i + 1`. */
- if (nargs < vararg && i != vararg) {
+ if (i < vararg) {
  buf[i] = current_arg;
  }
  else {