Move to a helper for emitting no positional args error

Author: cmaloney

Include/internal/pycore_modsupport.h

@@ -20,6 +20,12 @@ PyAPI_FUNC(int) _PyArg_NoPositional(const char *funcname, PyObject *args);
 #define _PyArg_NoPositional(funcname, args) \
     ((args) == NULL || _PyArg_NoPositional((funcname), (args)))
 
+// Export for Argument Clinic generated code in shared extensions
+PyAPI_FUNC(int) _PyArg_NoPositionalStack(const char *funcname,
+                                         Py_ssize_t nargs);
+#define _PyArg_NoPositionalStack(funcname, nargs) \
+    ((nargs) == 0 || _PyArg_NoPositionalStack((funcname), (nargs)))
+
 // Export for '_asyncio' shared extension
 PyAPI_FUNC(int) _PyArg_NoKeywords(const char *funcname, PyObject *kwargs);
 #define _PyArg_NoKeywords(funcname, kwargs) \

Lib/test/clinic.test.c

@@ -4995,12 +4995,8 @@ Test_vectorcall(PyObject *type, PyObject *const *args,
     /* Make sure the type object is immutable: the generated
      * vectorcall doesn't deal e.g. with users reassigning __init__. */
     assert(PyType_HasFeature(_PyType_CAST(type), Py_TPFLAGS_IMMUTABLETYPE));
-    if (nargs) {
-        PyErr_SetString(PyExc_TypeError,
-                        "Test() takes no positional arguments");
-        goto exit;
-    }
-    if (!_PyArg_NoKwnames("Test", kwnames)) {
+    if (!_PyArg_NoPositionalStack("Test", nargs) ||
+        !_PyArg_NoKwnames("Test", kwnames)) {
         goto exit;
     }
     self = _PyType_CAST(type)->tp_new(_PyType_CAST(type),
@@ -5021,7 +5017,7 @@ Test_vectorcall(PyObject *type, PyObject *const *args,
 
 static int
 Test___init___impl(TestObj *self)
-/*[clinic end generated code: output=3798499df7a60323 input=645fe693f6c6b9b6]*/
+/*[clinic end generated code: output=ce04b9d7beacd894 input=645fe693f6c6b9b6]*/
 
 
 /*[clinic input]

Python/getargs.c

@@ -2933,6 +2933,7 @@ _PyArg_UnpackStack(PyObject *const *args, Py_ssize_t nargs, const char *name,
 #undef _PyArg_NoKeywords
 #undef _PyArg_NoKwnames
 #undef _PyArg_NoPositional
+#undef _PyArg_NoPositionalStack
 
 /* For type constructors that don't take keyword args
  *
@@ -2967,8 +2968,15 @@ _PyArg_NoPositional(const char *funcname, PyObject *args)
         PyErr_BadInternalCall();
         return 0;
     }
-    if (PyTuple_GET_SIZE(args) == 0)
+    return _PyArg_NoPositionalStack(funcname, PyTuple_GET_SIZE(args));
+}
+
+int
+_PyArg_NoPositionalStack(const char *funcname, Py_ssize_t nargs)
+{
+    if (nargs == 0) {
         return 1;
+    }
 
     PyErr_Format(PyExc_TypeError, "%.200s() takes no positional arguments",
                     funcname);

Tools/clinic/libclinic/parse_args.py

@@ -1713,14 +1713,10 @@ def parse_vectorcall_no_args(self) -> None:
         """No keyword or positional arguments."""
         parser_code = self._vectorcall_type_check()
         self.codegen.add_include('pycore_modsupport.h',
-                                 '_PyArg_NoKwnames()')
+                                 '_PyArg_NoPositionalStack()')
         parser_code.append(libclinic.normalize_snippet("""
-            if (nargs) {{
-                PyErr_SetString(PyExc_TypeError,
-                                "{name}() takes no positional arguments");
-                goto exit;
-            }}
-            if (!_PyArg_NoKwnames("{name}", kwnames)) {{
+            if (!_PyArg_NoPositionalStack("{name}", nargs) ||
+                !_PyArg_NoKwnames("{name}", kwnames)) {{
                 goto exit;
             }}
             """, indent=4))