docstringtypes works

Author: pixelneo

autoload/vimpythondocstring.vim

@@ -17,7 +17,7 @@ function! vimpythondocstring#Full()
 endfunction
 
 function! vimpythondocstring#FullTypes()
-    python3 pydocstring.Docstring().full_docstring(types=True)
+    python3 pydocstring.Docstring().full_docstring(print_hints=True)
 endfunction
 
 function! vimpythondocstring#Oneline()

python/asthelper.py

@@ -84,12 +84,16 @@ def _handle_functions(self, node):
 
         if self.parent:
             for arg in node.args.args:
-                self.arguments.append({'arg': arg.arg, 'type': ast.unparse(arg.annotation)})
+                type_hint = None
+                if arg.annotation is not None:
+                    type_hint = ast.unparse(arg.annotation)
+                self.arguments.append({'arg': arg.arg, 'type': type_hint})
             if len(self.arguments) > 0 and (self.arguments[0] == 'self' or self.arguments[0] == 'cls'):
                 self.arguments.pop(0)
 
             self.returns = new_visitor.returns
             self.yields = new_visitor.yields
+            print(self.arguments)
 
     def visit_Raise(self, node):
         r = RaiseNameCollector()

python/pydocstring.py

@@ -77,7 +77,7 @@ def __init__(self, env, templater):
         self.templater = templater
 
     @abc.abstractmethod
-    def write_docstring(self):
+    def write_docstring(self, *args, **kwargs):
         """ Method to create a docstring for appropriate object
 
         Writes the docstring to correct lines in `self.env` object.
@@ -225,7 +225,7 @@ def _process_tree(self, tree):
         att = list(v.attributes)
         return att
 
-    def write_docstring(self):
+    def write_docstring(self, *args, **kwargs):
         sig_line, class_indent, tree = self._object_tree()
         attr = self._process_tree(tree)
         docstring = self.templater.get_class_docstring(class_indent, attr)
@@ -267,6 +267,7 @@ def full_docstring(self, print_hints=False):
             self.obj_controller.write_docstring(print_hints=print_hints)
         except Exception as e:
             print(concat_('Doctring ERROR: ', e))
+            raise e
 
     def oneline_docstring(self):
         """ Writes only a one-line empty docstring """

styles/google-method.txt

@@ -1,7 +1,7 @@
 """
 {% if args|len > 0 %}
 Args:
-{% for a in args %}{{indent}}{{a.arg}} {% if hints and a.type %}({{a.type}}){% endif %}:
+{% for a in args %}{{indent}}{{a.arg}}{% if hints and a.type %} ({{a.type}}){% endif %}:
 {% endfor %}{% endif %}{% if returns %}
 Returns:
 {{indent}}