Merge branch 'main' into unpack_keywords_bugfix

# Conflicts: # Lib/test/clinic.test
python · erlend-aasland · Nov 24, 2022 · Mar 24, 2022 · Mar 24, 2022 · Mar 24, 2022
commit f7b6662554c7f96b1a73b66fd371e362b93bcdc5
diff --git a/Lib/test/clinic.test b/Lib/test/clinic.test
@@ -3856,7 +3856,7 @@ test_vararg(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject
     };
     #undef KWTUPLE
     PyObject *argsbuf[2];
-    Py_ssize_t noptargs = Py_MIN(nargs, 1) + (kwnames ? PyTuple_GET_SIZE(kwnames) : 0) - 1;
+    Py_ssize_t noptargs = 0 + (kwnames ? PyTuple_GET_SIZE(kwnames) : 0) - 1;
     PyObject *a;
     PyObject *__clinic_args = NULL;
 
@@ -3875,7 +3875,7 @@ exit:
 
 static PyObject *
 test_vararg_impl(PyObject *module, PyObject *a, PyObject *args)
-/*[clinic end generated code: output=3ca94c3a745862a5 input=81d33815ad1bae6e]*/
+/*[clinic end generated code: output=6661f3ca97d85e8c input=81d33815ad1bae6e]*/
 
 /*[clinic input]
 test_vararg_with_default
@@ -3929,7 +3929,7 @@ test_vararg_with_default(PyObject *module, PyObject *const *args, Py_ssize_t nar
     };
     #undef KWTUPLE
     PyObject *argsbuf[3];
-    Py_ssize_t noptargs = Py_MIN(nargs, 1) + (kwnames ? PyTuple_GET_SIZE(kwnames) : 0) - 1;
+    Py_ssize_t noptargs = 0 + (kwnames ? PyTuple_GET_SIZE(kwnames) : 0) - 1;
     PyObject *a;
     PyObject *__clinic_args = NULL;
     int b = 0;
@@ -3958,7 +3958,7 @@ exit:
 static PyObject *
 test_vararg_with_default_impl(PyObject *module, PyObject *a, PyObject *args,
                               int b)
-/*[clinic end generated code: output=2a4faf0f251b2348 input=6e110b54acd9b22d]*/
+/*[clinic end generated code: output=5fe3cfccb1bef781 input=6e110b54acd9b22d]*/
 
 /*[clinic input]
 test_vararg_with_only_defaults