Merge pull request #11 from pixelneo/f-string-issue

fix raise name bug

Author: pixelneo

python/asthelper.py

@@ -1,15 +1,14 @@
 import ast
 
 
-class NameCollector(ast.NodeVisitor):
+class RaiseNameCollector(ast.NodeVisitor):
 
     def __init__(self):
         self.data = set()
         super().__init__()
 
-    def visit_Name(self, node):
-        self.data.add(node.id)
-        super().generic_visit(node)
+    def visit_Call(self, node):
+        self.data.add(node.func.id)
 
 
 class AttributeCollector(ast.NodeVisitor):
@@ -79,7 +78,7 @@ def __init__(self, parent=True):
         super().__init__()
 
     def visit_Raise(self, node):
-        r = NameCollector()
+        r = RaiseNameCollector()
         r.visit(node)
         self.raises |= r.data
         super().generic_visit(node)

python/pydocstring.py

@@ -138,7 +138,7 @@ def _object_tree(self):
         return sig_line, obj_indent, tree
 
     def _is_correct_indent(self, previous_line, line, expected_indent):
-        """ Check whether given line has either given indentation (or more) 
+        """ Check whether given line has either given indentation (or more)
             or does contain only nothing or whitespaces.
         """
         # Disclaimer: I know this does not check for multiline comments and strings

styles/google-method.txt

@@ -10,5 +10,6 @@ Yields:
 {{indent}}
 {% endif %}{% if raises|len > 0 %}
 Raises:
-{% for a in raises %}{{indent}}{{a}}:{% endfor %}{% endif %}
+{% for a in raises %}{{indent}}{{a}}:
+{% endfor %}{% endif %}
 """