Merge pull request #2262 from thseiler/code-climate/address-noredef

code-climate: mypy: address no-redef

Author: stanislaw

strictdoc/backend/reqif/reqif_export.py

@@ -1,4 +1,4 @@
-# mypy: disable-error-code="arg-type,no-redef,no-untyped-def"
+# mypy: disable-error-code="arg-type,no-untyped-def"
 import os
 from pathlib import Path
 
@@ -35,17 +35,14 @@ def export(
                 f"{project_config.reqif_profile}."
             )
 
+        output_file_path: str
         if not reqifz:
-            output_file_path: str = os.path.join(
-                output_reqif_root, "output.reqif"
-            )
+            output_file_path = os.path.join(output_reqif_root, "output.reqif")
             reqif_content: str = ReqIFUnparser.unparse(reqif_bundle)
             with open(output_file_path, "w", encoding="utf8") as output_file:
                 output_file.write(reqif_content)
         else:
-            output_file_path: str = os.path.join(
-                output_reqif_root, "output.reqifz"
-            )
+            output_file_path = os.path.join(output_reqif_root, "output.reqifz")
             reqifz_bundle = ReqIFZBundle(
                 reqif_bundles={"document_tree.reqif": reqif_bundle},
                 attachments={},

strictdoc/backend/reqif/reqif_import.py

@@ -1,4 +1,4 @@
-# mypy: disable-error-code="no-redef,no-untyped-def"
+# mypy: disable-error-code="no-untyped-def"
 import os.path
 from typing import List
 
@@ -25,12 +25,13 @@ def import_from_file(
             import_config.input_path
         )
 
+        documents: List[SDocDocument]
         if import_config.input_path.endswith(".reqifz"):
             reqifz_bundle: ReqIFZBundle = ReqIFZParser.parse(
                 import_config.input_path
             )
             assert len(reqifz_bundle.reqif_bundles) > 0
-            documents: List[SDocDocument] = converter.convert_reqif_bundle(
+            documents = converter.convert_reqif_bundle(
                 next(iter(reqifz_bundle.reqif_bundles.values())),
                 enable_mid=import_config.reqif_enable_mid
                 or project_config.reqif_enable_mid,
@@ -42,7 +43,7 @@ def import_from_file(
             reqif_bundle: ReqIFBundle = ReqIFParser.parse(
                 import_config.input_path
             )
-            documents: List[SDocDocument] = converter.convert_reqif_bundle(
+            documents = converter.convert_reqif_bundle(
                 reqif_bundle,
                 enable_mid=import_config.reqif_enable_mid
                 or project_config.reqif_enable_mid,

strictdoc/backend/sdoc/models/type_system.py

@@ -1,4 +1,4 @@
-# mypy: disable-error-code="no-redef,no-untyped-call,no-untyped-def"
+# mypy: disable-error-code="no-untyped-call,no-untyped-def"
 from typing import List, Optional, Tuple
 
 from strictdoc.helpers.auto_described import auto_described
@@ -83,7 +83,7 @@ def __init__(
         if g_line_range is not None:
             range_components_str = g_line_range.split(", ")
             assert len(range_components_str) == 2, range_components_str
-            self.line_range: Tuple[int, int] = (
+            self.line_range = (
                 int(range_components_str[0]),
                 int(range_components_str[1]),
             )

strictdoc/backend/sdoc_source_code/reader.py

@@ -1,4 +1,4 @@
-# mypy: disable-error-code="no-redef,no-untyped-call,no-untyped-def,type-arg"
+# mypy: disable-error-code="no-untyped-call,no-untyped-def,type-arg"
 import sys
 import traceback
 from functools import partial
@@ -127,14 +127,13 @@ def range_marker_processor(marker: RangeMarker, parse_context: ParseContext):
     location = get_location(marker)
     line = location["line"]
 
+    current_top_marker: RangeMarker
     if marker.ng_is_nodoc:
         if marker.is_begin():
             parse_context.marker_stack.append(marker)
         elif marker.is_end():
             try:
-                current_top_marker: RangeMarker = (
-                    parse_context.marker_stack.pop()
-                )
+                current_top_marker = parse_context.marker_stack.pop()
                 if (
                     not current_top_marker.ng_is_nodoc
                     or current_top_marker.is_end()
@@ -165,7 +164,7 @@ def range_marker_processor(marker: RangeMarker, parse_context: ParseContext):
 
     elif marker.is_end():
         try:
-            current_top_marker: RangeMarker = parse_context.marker_stack.pop()
+            current_top_marker = parse_context.marker_stack.pop()
             if marker.reqs != current_top_marker.reqs:
                 raise create_begin_end_range_reqs_mismatch_error(
                     location, current_top_marker.reqs, marker.reqs

strictdoc/backend/sdoc_source_code/reader_c.py

@@ -1,4 +1,4 @@
-# mypy: disable-error-code="no-redef,no-untyped-call,no-untyped-def,type-arg"
+# mypy: disable-error-code="no-untyped-call,no-untyped-def,type-arg"
 import sys
 import traceback
 from typing import List, Optional, Sequence, Union
@@ -63,6 +63,10 @@ def read(
 
         nodes = traverse_tree(tree)
         for node_ in nodes:
+            function_name: str
+            function_markers: List[FunctionRangeMarker]
+            function_comment_node: Optional[Node]
+            markers: List[Union[FunctionRangeMarker, RangeMarker, LineMarker]]
             if node_.type == "translation_unit":
                 if (
                     len(node_.children) > 0
@@ -138,9 +142,7 @@ def read(
                 )
 
                 assert function_declarator_node.text is not None, node_.text
-                function_name: str = function_declarator_node.text.decode(
-                    "utf8"
-                )
+                function_name = function_declarator_node.text.decode("utf8")
                 assert function_name is not None, node_.text
 
                 parent_names = self.get_node_ns(node_)
@@ -159,8 +161,8 @@ def read(
                     if specifier_node_.text == b"static":
                         function_attributes.add(FunctionAttribute.STATIC)
 
-                function_markers: List[FunctionRangeMarker] = []
-                function_comment_node: Optional[Node] = None
+                function_markers = []
+                function_comment_node = None
                 if (
                     node_.prev_sibling is not None
                     and node_.prev_sibling.type == "comment"
@@ -208,7 +210,7 @@ def read(
                 traceability_info.functions.append(new_function)
 
             elif node_.type == "function_definition":
-                function_name: str = ""
+                function_name = ""
 
                 function_declarator_node = ts_find_child_node_by_type(
                     node_, "function_declarator"
@@ -256,8 +258,8 @@ def read(
                 if function_name.startswith("TEST"):
                     function_display_name = function_name
 
-                function_markers: List[FunctionRangeMarker] = []
-                function_comment_node: Optional[Node] = None
+                function_markers = []
+                function_comment_node = None
                 function_comment_text = None
                 if (
                     node_.prev_sibling is not None
@@ -318,9 +320,7 @@ def read(
 
                 node_text_string = node_.text.decode("utf8")
 
-                markers: List[
-                    Union[FunctionRangeMarker, RangeMarker, LineMarker]
-                ] = MarkerParser.parse(
+                markers = MarkerParser.parse(
                     node_text_string,
                     node_.start_point[0] + 1,
                     node_.end_point[0] + 1,

strictdoc/backend/sdoc_source_code/reader_python.py

@@ -1,4 +1,4 @@
-# mypy: disable-error-code="no-redef,no-untyped-call,no-untyped-def,type-arg"
+# mypy: disable-error-code="no-untyped-call,no-untyped-def,type-arg"
 import sys
 import traceback
 from itertools import islice
@@ -60,6 +60,7 @@ def read(
 
         nodes = traverse_tree(tree)
         map_function_to_node = {}
+        markers: List[Union[FunctionRangeMarker, RangeMarker, LineMarker]]
         for node_ in nodes:
             if node_.type == "module":
                 function = Function(
@@ -222,9 +223,7 @@ def read(
 
                 node_text_string = node_.text.decode("utf8")
 
-                markers: List[
-                    Union[FunctionRangeMarker, RangeMarker, LineMarker]
-                ] = MarkerParser.parse(
+                markers = MarkerParser.parse(
                     node_text_string,
                     node_.start_point[0] + 1,
                     node_.end_point[0] + 1,

strictdoc/core/traceability_index_builder.py

@@ -1,4 +1,4 @@
-# mypy: disable-error-code="arg-type,attr-defined,no-redef,no-untyped-call,no-untyped-def,union-attr"
+# mypy: disable-error-code="arg-type,attr-defined,no-untyped-call,no-untyped-def,union-attr"
 import datetime
 import glob
 import os
@@ -479,9 +479,9 @@ def print_line(text: str):
                     )
 
                 if node.is_requirement():
-                    requirement: SDocNode = assert_cast(node, SDocNode)
-                    if requirement.reserved_tags is not None:
-                        for tag in requirement.reserved_tags:
+                    requirement_node: SDocNode = assert_cast(node, SDocNode)
+                    if requirement_node.reserved_tags is not None:
+                        for tag in requirement_node.reserved_tags:
                             document_tags.setdefault(tag, 0)
                             document_tags[tag] += 1
                     for node_field_ in node.enumerate_fields():
@@ -505,6 +505,8 @@ def print_line(text: str):
 
         # Now iterate over the requirements again to build an in-depth map of
         # parents and children.
+        requirement: SDocNode
+
         for document in document_tree.document_list:
             document_iterator = d_01_document_iterators[document]
 
@@ -515,7 +517,7 @@ def print_line(text: str):
                 if not node.is_requirement():
                     continue
 
-                requirement: SDocNode = node
+                requirement = assert_cast(node, SDocNode)
 
                 #
                 # At this point, we resolve LINKs, and the expectation is that
@@ -657,7 +659,7 @@ def print_line(text: str):
                 # FIXME: is_requirement() typing issue.
                 if not node.is_requirement():
                     continue
-                requirement: Union[SDocNode] = assert_cast(node, SDocNode)
+                requirement = assert_cast(node, SDocNode)
                 if requirement.reserved_uid is None:
                     continue
 

strictdoc/export/html/form_objects/requirement_form_object.py

@@ -1,4 +1,4 @@
-# mypy: disable-error-code="arg-type,attr-defined,no-redef,no-untyped-call,no-untyped-def,union-attr,type-arg"
+# mypy: disable-error-code="arg-type,attr-defined,no-untyped-call,no-untyped-def,union-attr,type-arg"
 from collections import defaultdict
 from enum import Enum
 from typing import Dict, Iterable, List, Optional, Set, Union
@@ -463,21 +463,21 @@ def create_from_requirement(
                 )
                 form_refs_fields.append(form_ref_field)
             elif isinstance(reference_value, ChildReqReference):
-                child_reference: ChildReqReference = reference_value
+                child_req_reference: ChildReqReference = reference_value
                 form_ref_field = RequirementReferenceFormField(
-                    field_mid=child_reference.mid,
+                    field_mid=child_req_reference.mid,
                     field_type=RequirementReferenceFormField.FieldType.CHILD,
-                    field_value=child_reference.ref_uid,
-                    field_role=child_reference.role,
+                    field_value=child_req_reference.ref_uid,
+                    field_role=child_req_reference.role,
                 )
                 form_refs_fields.append(form_ref_field)
             elif isinstance(reference_value, FileReference):
-                child_reference: FileReference = reference_value
+                child_file_reference: FileReference = reference_value
                 form_ref_field = RequirementReferenceFormField(
-                    field_mid=child_reference.mid,
+                    field_mid=child_file_reference.mid,
                     field_type=RequirementReferenceFormField.FieldType.FILE,
-                    field_value=child_reference.get_posix_path(),
-                    field_role=child_reference.role,
+                    field_value=child_file_reference.get_posix_path(),
+                    field_role=child_file_reference.role,
                 )
                 form_refs_fields.append(form_ref_field)
         return RequirementFormObject(

strictdoc/export/html/form_objects/rows/row_with_grammar_element_form_object.py

@@ -1,4 +1,4 @@
-# mypy: disable-error-code="no-redef,no-untyped-def,union-attr,type-arg"
+# mypy: disable-error-code="no-untyped-def,union-attr,type-arg"
 from dataclasses import dataclass
 from typing import Any, Dict, List
 

strictdoc/export/html/generators/view_objects/document_screen_view_object.py

@@ -1,4 +1,4 @@
-# mypy: disable-error-code="no-redef,no-untyped-call,no-untyped-def,union-attr"
+# mypy: disable-error-code="no-untyped-call,no-untyped-def,union-attr"
 from dataclasses import dataclass
 from datetime import datetime
 from typing import List, Optional, Union
@@ -64,8 +64,6 @@ def __init__(
         self.is_running_on_server: bool = project_config.is_running_on_server
         self.strictdoc_version = __version__
 
-        self.custom_html2pdf_template = None
-
         self.custom_html2pdf_template: Optional[Template] = None
         if project_config.html2pdf_template is not None:
             with open(project_config.html2pdf_template) as f_: