Fixed mandatory kwonly args

Snooz82 · Snooz82 · commit 2004cab2e21a · 2020-09-29T21:15:18.000+02:00
diff --git a/src/robot/libdocpkg/consoleviewer.py b/src/robot/libdocpkg/consoleviewer.py
@@ -74,7 +74,7 @@ def _show_inits(self, lib):
     def _show_keyword(self, kw, show_name=True):
         if show_name:
             self._header(kw.name, underline='-')
-        self._data([('Arguments', '[%s]' % ', '.join(kw.args))])
+        self._data([('Arguments', '[%s]' % ', '.join([str(arg) for arg in kw.args]))])
         self._doc(kw.doc)
 
     def _header(self, name, underline):
diff --git a/src/robot/libdocpkg/robotbuilder.py b/src/robot/libdocpkg/robotbuilder.py
@@ -155,16 +155,21 @@ def _get_args(argspec):
                                              optional=True))
             for arg_name in argspec.kwonlyargs:
                 value_type = None
-                default_value = argspec.defaults[arg_name]
+                default_value = None
+                optional = False
+                if argspec.defaults and arg_name in argspec.defaults:
+                    default_value = argspec.defaults[arg_name]
+                    optional = True
                 if argspec.types and arg_name in argspec.types:
                     value_type = argspec.types[arg_name]
                 arguments.append(ArgumentDoc(name=arg_name,
                                              value_type=value_type,
                                              default_value=default_value,
                                              argument_type='kwonlyargs',
-                                             optional=True))
+                                             optional=optional))
         if argspec.kwargs:
             arguments.append(ArgumentDoc(name=argspec.kwargs,
                                          argument_type='kwargs',
                                          optional=True))
+
         return arguments
diff --git a/src/robot/libdocpkg/writer.py b/src/robot/libdocpkg/writer.py
@@ -28,7 +28,7 @@ def LibdocWriter(format=None):
         return LibdocXmlWriter()
     if format == 'XML:HTML':
         return LibdocXmlWriter(force_html_doc=True)
-    if format == 'JSON':
+    if format == 'JSON':  # ToDo: add JSON to Errors and writers etc
         return LibdocJsonWriter()
     raise DataError("Format must be either 'HTML', 'XML', 'JSON' or 'XML:HTML', "
                     "got '%s'." % format)
