feat: cognitive complexity - tidy up tests

radon/contrib/cognitive_complexity.py

@@ -147,20 +147,15 @@ def visit_If(self, node):
         name = self.get_name(node)
 
         # Check for a lineno attribute
-        if hasattr(node, "lineno"):
+        if hasattr(node, "lineno"): # pragma: no cover
             self.max_line = node.lineno
 
         self.complexity += 1
         if not self.is_elif:
             self.complexity += self.nesting
 
-        # self.print_node("elif" if self.is_elif else name, "?")
-
-        # self.is_elif = False
-
         for field, value in ast.iter_fields(node):
 
-            # print(SEP, name, field, value)
             nest = 1
 
             # Handle `elif` and `else` clauses
@@ -179,6 +174,7 @@ def visit_If(self, node):
 
             self.nesting += nest
 
+
             # same as ast.NodeVisitor.generic_visit
             if isinstance(value, list):
                 for item in value:
@@ -197,7 +193,7 @@ def visit_ExceptHandler(self, node):
         Adds 1 to complexity and a
         nesting for the inner body.
         '''
-        print("Visit TryExcept", vars(node))
+        # print("Visit TryExcept", vars(node))
 
         self.complexity += 1 + self.nesting
         self.nesting += 1
@@ -215,7 +211,7 @@ def visit_Try(self, node):
 
         Only `except` and `else` blocks increase the nesting.
         '''
-        print("Visit Try", vars(node))
+        # print("Visit Try", vars(node))
 
         for item in node.body:
             if isinstance(item, ast.AST):
@@ -245,7 +241,7 @@ def visit_Match(self, node):
 
         Increases nesting and increments complexity.
         '''
-        print("Vists Match", vars(node))
+        # print("Vists Match", vars(node))
 
         self.complexity += 1
 
@@ -263,7 +259,7 @@ def generic_visit(self, node):
         # Get the name of the class
         name = self.get_name(node)
 
-        print(name, vars(node))
+        # print("Generic ", name, self.nesting, vars(node))
 
         # Check for a lineno attribute
         if hasattr(node, "lineno"):
@@ -308,11 +304,11 @@ def generic_visit(self, node):
                 # Recursion
                 self.complexity += 1
 
-        self.print_node(name)
+        # self.print_node(name)
 
         for field, value in ast.iter_fields(node):
 
-            print("iterate generic:", field, value)
+            # print("iterate generic:", field, value)
             nest = name in (
                 "For",
                 "While",
@@ -388,11 +384,14 @@ def visit_FunctionDef(self, node):
 
         # Top level functions are ignored
         # but nested functions increase the nesting level
-        if self.in_closure:
+        nested = self.in_closure
+
+        if nested:
             self.nesting += 1
         elif not is_decorator:
             self.in_closure = 1
 
+        # print("Visit FunctionDef", self.nesting)
         for child in node.body:
 
             visitor = CognitiveComplexityVisitor(
@@ -409,7 +408,7 @@ def visit_FunctionDef(self, node):
                 visitor.complexity + visitor.functions_complexity
             )
 
-        if self.in_closure:
+        if nested:
             self.nesting -= 1
 
         func = Function(
@@ -422,6 +421,7 @@ def visit_FunctionDef(self, node):
             closures,
             body_complexity,
         )
+
         self.functions.append(func)
 
     def visit_ClassDef(self, node):
@@ -438,6 +438,7 @@ def visit_ClassDef(self, node):
         classname = node.name
         visitors_max_lines = [node.lineno]
         inner_classes = []
+
         for child in node.body:
             visitor = CognitiveComplexityVisitor(
                 True,
@@ -454,6 +455,7 @@ def visit_ClassDef(self, node):
             body_complexity += (
                 visitor.complexity + visitor.functions_complexity
             )
+
             visitors_max_lines.append(visitor.max_line)
             inner_classes.extend(visitor.classes)