https://github.com/python/cpython/commit/f2cc8ad989ba1039f69b62f92c2eb700d142e285
commit: f2cc8ad989ba1039f69b62f92c2eb700d142e285
branch: 3.12
author: Serhiy Storchaka <[email protected]>
committer: serhiy-storchaka <[email protected]>
date: 2024-08-08T09:49:50+03:00
summary:
[3.12] gh-118814: Fix the TypeVar constructor when name is passed by keyword
(GH-122664) (GH-122807)
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 540fcc62f5da982b79504221cac01bfab8b73ba1)
files:
A Misc/NEWS.d/next/Library/2024-08-04-14-07-18.gh-issue-118814.uiyks1.rst
M Lib/test/test_clinic.py
M Lib/test/test_typing.py
M Modules/_testclinic.c
M Modules/clinic/_testclinic.c.h
M Python/getargs.c
diff --git a/Lib/test/test_clinic.py b/Lib/test/test_clinic.py
index c114a62ce09d8d..523b522a3afc9e 100644
--- a/Lib/test/test_clinic.py
+++ b/Lib/test/test_clinic.py
@@ -2093,11 +2093,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))
diff --git a/Lib/test/test_typing.py b/Lib/test/test_typing.py
index e6441943b8db57..106bd81b69e34c 100644
--- a/Lib/test/test_typing.py
+++ b/Lib/test/test_typing.py
@@ -579,6 +579,41 @@ def test_constructor(self):
self.assertEqual(T.__name__, "T")
self.assertEqual(T.__constraints__, ())
self.assertIs(T.__bound__, None)
+ 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.__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.__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.__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.__covariant__, False)
+ self.assertIs(T.__contravariant__, False)
+ self.assertIs(T.__infer_variance__, True)
def template_replace(templates: list[str], replacements: dict[str, list[str]])
-> list[tuple[str]]:
diff --git
a/Misc/NEWS.d/next/Library/2024-08-04-14-07-18.gh-issue-118814.uiyks1.rst
b/Misc/NEWS.d/next/Library/2024-08-04-14-07-18.gh-issue-118814.uiyks1.rst
new file mode 100644
index 00000000000000..14ef6c070603ae
--- /dev/null
+++ b/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.
diff --git a/Modules/_testclinic.c b/Modules/_testclinic.c
index 676535f5463be6..29cc106a429990 100644
--- a/Modules/_testclinic.c
+++ b/Modules/_testclinic.c
@@ -1034,6 +1034,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
@@ -1274,6 +1293,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
diff --git a/Modules/clinic/_testclinic.c.h b/Modules/clinic/_testclinic.c.h
index 3fce262459146b..a9bcbf753d2baf 100644
--- a/Modules/clinic/_testclinic.c.h
+++ b/Modules/clinic/_testclinic.c.h
@@ -2547,6 +2547,78 @@ vararg_with_default(PyObject *module, PyObject *const
*args, Py_ssize_t nargs, P
return return_value;
}
+PyDoc_STRVAR(vararg_with_default2__doc__,
+"vararg_with_default2($module, /, a, *args, b=None, c=None)\n"
+"--\n"
+"\n");
+
+#define VARARG_WITH_DEFAULT2_METHODDEF \
+ {"vararg_with_default2", _PyCFunction_CAST(vararg_with_default2),
METH_FASTCALL|METH_KEYWORDS, vararg_with_default2__doc__},
+
+static PyObject *
+vararg_with_default2_impl(PyObject *module, PyObject *a, PyObject *args,
+ PyObject *b, PyObject *c);
+
+static PyObject *
+vararg_with_default2(PyObject *module, PyObject *const *args, Py_ssize_t
nargs, PyObject *kwnames)
+{
+ PyObject *return_value = NULL;
+ #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
+
+ #define NUM_KEYWORDS 3
+ static struct {
+ PyGC_Head _this_is_not_used;
+ PyObject_VAR_HEAD
+ PyObject *ob_item[NUM_KEYWORDS];
+ } _kwtuple = {
+ .ob_base = PyVarObject_HEAD_INIT(&PyTuple_Type, NUM_KEYWORDS)
+ .ob_item = { &_Py_ID(a), &_Py_ID(b), &_Py_ID(c), },
+ };
+ #undef NUM_KEYWORDS
+ #define KWTUPLE (&_kwtuple.ob_base.ob_base)
+
+ #else // !Py_BUILD_CORE
+ # define KWTUPLE NULL
+ #endif // !Py_BUILD_CORE
+
+ static const char * const _keywords[] = {"a", "b", "c", NULL};
+ static _PyArg_Parser _parser = {
+ .keywords = _keywords,
+ .fname = "vararg_with_default2",
+ .kwtuple = KWTUPLE,
+ };
+ #undef KWTUPLE
+ PyObject *argsbuf[4];
+ Py_ssize_t noptargs = Py_MIN(nargs, 1) + (kwnames ?
PyTuple_GET_SIZE(kwnames) : 0) - 1;
+ PyObject *a;
+ PyObject *__clinic_args = NULL;
+ PyObject *b = Py_None;
+ PyObject *c = Py_None;
+
+ args = _PyArg_UnpackKeywordsWithVararg(args, nargs, NULL, kwnames,
&_parser, 1, 1, 0, 1, argsbuf);
+ if (!args) {
+ goto exit;
+ }
+ a = args[0];
+ __clinic_args = args[1];
+ if (!noptargs) {
+ goto skip_optional_kwonly;
+ }
+ if (args[2]) {
+ b = args[2];
+ if (!--noptargs) {
+ goto skip_optional_kwonly;
+ }
+ }
+ c = args[3];
+skip_optional_kwonly:
+ return_value = vararg_with_default2_impl(module, a, __clinic_args, b, c);
+
+exit:
+ Py_XDECREF(__clinic_args);
+ return return_value;
+}
+
PyDoc_STRVAR(vararg_with_only_defaults__doc__,
"vararg_with_only_defaults($module, /, *args, b=None)\n"
"--\n"
@@ -3097,4 +3169,4 @@ _testclinic_TestClass_meth_method_no_params(PyObject
*self, PyTypeObject *cls, P
}
return _testclinic_TestClass_meth_method_no_params_impl(self, cls);
}
-/*[clinic end generated code: output=999de26ba394ab5d input=a9049054013a1b77]*/
+/*[clinic end generated code: output=d1fcf6ab8867f4ad input=a9049054013a1b77]*/
diff --git a/Python/getargs.c b/Python/getargs.c
index 8ca865b53c8d54..e7c2654f93aec4 100644
--- a/Python/getargs.c
+++ b/Python/getargs.c
@@ -2640,7 +2640,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) {
+ if (i < vararg) {
buf[i] = current_arg;
}
else {
_______________________________________________
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]
