adjustments

Author: jonykalavera

py2puml/domain/umlclass.py

@@ -1,6 +1,5 @@
-from inspect import signature
 from typing import List
-from dataclasses import dataclass, field
+from dataclasses import dataclass
 
 from py2puml.domain.umlitem import UmlItem
 

py2puml/inspection/inspectclass.py

@@ -38,7 +38,7 @@ def inspect_static_attributes(
     class_type: Type,
     root_module_name: str,
     domain_relations: List[UmlRelation]
-) -> List[UmlAttribute]:
+):
     # inspect_domain_definition(class_type)
     type_annotations = getattr(class_type, '__annotations__', None)
     if type_annotations is not None:
@@ -75,7 +75,6 @@ def inspect_static_attributes(
             uml_attr = UmlAttribute(attr_name, attr_type, static=True)
             definition_attrs.append(uml_attr)
 
-    return definition_attrs
 
 def inspect_methods(
     definition_methods, class_type,
@@ -116,14 +115,12 @@ def inspect_class_type(
     domain_relations: List[UmlRelation]
 ):
     uml_class = handle_class_type(class_type, class_type_fqn, domain_items_by_fqn)
-    attributes = inspect_static_attributes(
+    inspect_static_attributes(
         class_type_fqn, uml_class.attributes, class_type, root_module_name, domain_relations
     )
-    inspect_methods(
-        uml_class.methods, class_type
-    )
+    inspect_methods(uml_class.methods, class_type)
     instance_attributes, compositions = parse_class_constructor(class_type, class_type_fqn, root_module_name)
-    attributes.extend(instance_attributes)
+    uml_class.attributes.extend(instance_attributes)
     domain_relations.extend(compositions.values())
 
     handle_inheritance_relation(class_type, class_type_fqn, root_module_name, domain_relations)
@@ -136,13 +133,11 @@ def inspect_dataclass_type(
     domain_relations: List[UmlRelation]
 ):
     uml_class = handle_class_type(class_type, class_type_fqn, domain_items_by_fqn)
-    attributes = inspect_static_attributes(
+    inspect_static_attributes(
         class_type_fqn, uml_class.attributes, class_type, root_module_name, domain_relations
     )
-    inspect_methods(
-        uml_class.methods, class_type
-    )
-    for attribute in attributes:
+    inspect_methods(uml_class.methods, class_type)
+    for attribute in uml_class.attributes:
         attribute.static = False
 
     handle_inheritance_relation(class_type, class_type_fqn, root_module_name, domain_relations)