minor fixes

pixelneo · pixelneo · commit 8760ffd394f4 · 2019-09-11T18:40:25.000+02:00
diff --git a/python/TODO b/python/TODO
@@ -5,3 +5,7 @@
 
 - maybe get rid of colons after each attribute in class (and possibly arg in method) docstring - not everything needs to be explained
 
+- !!! fix: when creating docstring on class, there are calls on self. methods in the attribute list
+           fix it as follows, attribute has have an assigned value, Assign.targets[i].Attribute ...
+
+- sort attributes
diff --git a/python/asthelper.py b/python/asthelper.py
@@ -36,11 +36,11 @@ def __init__(self, instance_name):
         self.instance_name = instance_name
 
     def visit_Attribute(self, node):
-        try:
+        if isinstance(node.value, ast.Name):
             if node.value.id == self.instance_name:
                 self.attributes.add(node.attr)
-        except Exception as e:
-            pass
+        else:
+            self.generic_visit(node)
 
 
 class MethodVisitor(ast.NodeVisitor):
diff --git a/python/pydocstring.py b/python/pydocstring.py
@@ -13,14 +13,17 @@
 
 
 class InvalidSyntax(Exception):
+    """ Raise when the syntax of processed object is invalid. """
     pass
 
 
 class DocstringUnavailable(Exception):
+    """ Raise when trying to process object to which there is no docstring. """
     pass
 
 
 class Templater:
+
     def __init__(self, location, indent, style='google'):
         self.style = style
         self.indent = indent
@@ -88,8 +91,8 @@ def _object_tree(self):
 
         lines.append(first_line)
 
-        func_indent = re.findall('^(\s*)', first_line)[0]
-        expected_indent = concat_(func_indent, self.env.python_indent)
+        obj_indent = re.findall('^(\s*)', first_line)[0]
+        expected_indent = concat_(obj_indent, self.env.python_indent)
 
         valid_sig, _ = self._is_valid(first_line)
 
@@ -107,14 +110,14 @@ def _object_tree(self):
                 valid_sig, _ = self._is_valid(data)
                 sig_line = last_row
 
-        # remove func_indent from the beginning of all lines
-        data = '\n'.join([re.sub('^'+func_indent, '', l) for l in lines])
+        # remove obj_indent from the beginning of all lines
+        data = '\n'.join([re.sub('^'+obj_indent, '', l) for l in lines])
         try:
             tree = ast.parse(data)
         except Exception as e:
             raise InvalidSyntax('Object has invalid syntax.')
 
-        return sig_line, func_indent, tree
+        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) 
