bpo-37207: Use _PyArg_CheckPositional() for tuple vectorcall (GH-18986)

corona10 · web-flow · commit c98f87fc330e · 2020-03-16T15:04:14.000+01:00
diff --git a/Objects/tupleobject.c b/Objects/tupleobject.c
@@ -713,9 +713,9 @@ tuple_vectorcall(PyObject *type, PyObject * const*args,
         PyErr_Format(PyExc_TypeError, "tuple() takes no keyword arguments");
         return NULL;
     }
+
     Py_ssize_t nargs = PyVectorcall_NARGS(nargsf);
-    if (nargs > 1) {
-        PyErr_Format(PyExc_TypeError, "tuple() expected at most 1 argument, got %zd", nargs);
+    if (!_PyArg_CheckPositional("tuple", nargs, 0, 1)) {
         return NULL;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -713,9 +713,9 @@ tuple_vectorcall(PyObject type, PyObject const*args,`
`713`	`713`	`PyErr_Format(PyExc_TypeError, "tuple() takes no keyword arguments");`
`714`	`714`	`return NULL;`
`715`	`715`	`}`
	`716`	`+`
`716`	`717`	`Py_ssize_t nargs = PyVectorcall_NARGS(nargsf);`
`717`		`- if (nargs > 1) {`
`718`		`- PyErr_Format(PyExc_TypeError, "tuple() expected at most 1 argument, got %zd", nargs);`
	`718`	`+ if (!_PyArg_CheckPositional("tuple", nargs, 0, 1)) {`
`719`	`719`	`return NULL;`
`720`	`720`	`}`
`721`	`721`