Add Parameter.is_variable_length()

Author: AA-Turner

Tools/clinic/libclinic/converter.py

@@ -274,7 +274,7 @@ def _render_non_self(
             data.modifications.append('/* modifications for ' + name + ' */\n' + modifications.rstrip())
 
         # keywords
-        if parameter.is_vararg() or parameter.is_var_keyword():
+        if parameter.is_variable_length():
             pass
         elif parameter.is_positional_only():
             data.keywords.append('')

Tools/clinic/libclinic/dsl_parser.py

@@ -1468,10 +1468,7 @@ def add_parameter(text: str) -> None:
                 name = p.converter.signature_name or p.name
                 p_lines.append(name)
 
-                if (
-                    not (p.is_vararg() or p.is_var_keyword())
-                    and p.converter.is_optional()
-                ):
+                if not p.is_variable_length() and p.converter.is_optional():
                     p_lines.append('=')
                     value = p.converter.py_default
                     if not value:

Tools/clinic/libclinic/function.py

@@ -214,18 +214,24 @@ class Parameter:
     def __repr__(self) -> str:
         return f'<clinic.Parameter {self.name!r}>'
 
-    def is_keyword_only(self) -> bool:
-        return self.kind == inspect.Parameter.KEYWORD_ONLY
-
     def is_positional_only(self) -> bool:
         return self.kind == inspect.Parameter.POSITIONAL_ONLY
 
+    def is_positional_or_keyword(self) -> bool:
+        return self.kind == inspect.Parameter.POSITIONAL_OR_KEYWORD
+
+    def is_keyword_only(self) -> bool:
+        return self.kind == inspect.Parameter.KEYWORD_ONLY
+
     def is_vararg(self) -> bool:
         return self.kind == inspect.Parameter.VAR_POSITIONAL
 
     def is_var_keyword(self) -> bool:
         return self.kind == inspect.Parameter.VAR_KEYWORD
 
+    def is_variable_length(self) -> bool:
+        return self.is_vararg() or self.is_var_keyword()
+
     def is_optional(self) -> bool:
         return not self.is_vararg() and (self.default is not unspecified)
 

Tools/clinic/libclinic/parse_args.py

@@ -36,7 +36,7 @@ def declare_parser(
 
     num_keywords = len([
         p for p in f.parameters.values()
-        if not p.is_positional_only() and not (p.is_vararg() or p.is_var_keyword())
+        if p.is_positional_or_keyword() or p.is_keyword_only()
     ])
 
     condition = '#if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)'