Integrate mypy part 2

Author: barnabasdomozi

analyzer/codechecker_analyzer/analysis_manager.py

@@ -19,7 +19,7 @@
 from functools import lru_cache
 from threading import Timer
 
-import multiprocess
+import multiprocess  # type: ignore
 
 from codechecker_common.logger import get_logger
 from codechecker_common.process import kill_process_tree

analyzer/codechecker_analyzer/analyzer.py

@@ -18,7 +18,7 @@
 import sys
 import time
 
-from multiprocess.managers import SyncManager
+from multiprocess.managers import SyncManager  # type: ignore
 
 from codechecker_common.logger import get_logger, DEBUG
 from codechecker_common.review_status_handler import ReviewStatusHandler

analyzer/codechecker_analyzer/analyzers/analyzer_base.py

@@ -151,6 +151,13 @@ def get_analyzer_checkers(cls):
         """
         raise NotImplementedError("Subclasses should implement this!")
 
+    @classmethod
+    def analyzer_binary(cls) -> str:
+        """
+        Return path to the analyzer binary.
+        """
+        raise NotImplementedError("Subclasses should implement this!")
+
     @classmethod
     def get_analyzer_config(cls) -> List[AnalyzerConfig]:
         return []

analyzer/codechecker_analyzer/analyzers/clangsa/analyzer.py

@@ -361,7 +361,7 @@ def get_analyzer_checkers(
         cls,
         alpha: bool = True,
         debug: bool = False
-    ) -> List[str]:
+    ) -> List[Tuple[str, str]]:
         """
         Return the list of the supported checkers.
 
@@ -425,7 +425,8 @@ def get_checker_config(cls) -> List[analyzer_base.CheckerConfig]:
 
         result = []
         for cfg, doc in parse_clang_help_page(command, 'OPTIONS:'):
-            result.append(analyzer_base.CheckerConfig(*cfg.split(':', 1), doc))
+            checker, opt = cfg.split(':', 1)
+            result.append(analyzer_base.CheckerConfig(checker, opt, doc))
 
         return result
 
@@ -439,11 +440,11 @@ def get_analyzer_config(cls) -> List[analyzer_base.AnalyzerConfig]:
         command.append("-analyzer-config-help")
 
         native_config = parse_clang_help_page(command, 'OPTIONS:')
-        native_config = map(
+        analyzer_config_list: List[analyzer_base.AnalyzerConfig] = list(map(
             lambda cfg: analyzer_base.AnalyzerConfig(cfg[0], cfg[1], str),
-            native_config)
+            native_config))
 
-        return list(native_config) + list(cls.__additional_analyzer_config)
+        return analyzer_config_list + list(cls.__additional_analyzer_config)
 
     def post_analyze(self, result_handler):
         """

analyzer/codechecker_analyzer/analyzers/clangtidy/analyzer.py

@@ -351,7 +351,8 @@ def get_checker_config(cls) -> List[analyzer_base.CheckerConfig]:
 
         result = []
         for cfg, doc in parse_checker_config(help_page):
-            result.append(analyzer_base.CheckerConfig(*cfg.split(':', 1), doc))
+            checker, opt = cfg.split(':', 1)
+            result.append(analyzer_base.CheckerConfig(checker, opt, doc))
 
         return result
 

analyzer/codechecker_analyzer/analyzers/cppcheck/result_handler.py

@@ -21,6 +21,8 @@
 from codechecker_common.skiplist_handler import SkipListHandlers
 from codechecker_common.review_status_handler import ReviewStatusHandler
 
+from codechecker_analyzer.analyzers.cppcheck.analyzer import Cppcheck
+
 from ..result_handler_base import ResultHandler
 
 LOG = get_logger('analyzer.cppcheck')
@@ -31,6 +33,10 @@ class CppcheckResultHandler(ResultHandler):
     Create analyzer result file for Cppcheck output.
     """
 
+    # This attribute is set dynamically when constructing
+    # this class.
+    analyzer: Cppcheck
+
     def __init__(self, *args, **kwargs):
         self.analyzer_info = AnalyzerInfo(name=AnalyzerResult.TOOL_NAME)
 

analyzer/codechecker_analyzer/buildlog/host_check.py

@@ -32,7 +32,7 @@ def check_intercept(env) -> bool:
             stdout=subprocess.DEVNULL,
             stderr=subprocess.DEVNULL,
             encoding="utf-8",
-            errors="ignore")
+            errors="ignore")  # type: ignore
 
         if not res:
             return True
@@ -74,4 +74,4 @@ def check_ldlogger(env) -> bool:
     alternative_logger_lib_dir_path = os.path.join(
         lib_dir_path, 'codechecker_analyzer', 'ld_logger', 'lib', '**',
         'ldlogger.so')
-    return glob.glob(alternative_logger_lib_dir_path, recursive=True)
+    return bool(glob.glob(alternative_logger_lib_dir_path, recursive=True))

analyzer/codechecker_analyzer/buildlog/log_parser.py

@@ -22,7 +22,7 @@
 import sys
 import tempfile
 import traceback
-from typing import Dict, List, Optional
+from typing import Dict, List, Optional, Any
 
 from codechecker_analyzer.analyzers.clangsa.analyzer import ClangSA
 
@@ -49,7 +49,7 @@
 # The compilation flags of which the prefix is any of these regular expressions
 # will not be included in the output Clang command.
 # These flags should be ignored only in case the original compiler is clang.
-IGNORED_OPTIONS_CLANG = [
+IGNORED_OPTIONS_LIST_CLANG = [
     # Clang gives different warnings than GCC. Thus if these flags are kept,
     # '-Werror', '-pedantic-errors' the analysis with Clang can fail even
     # if the compilation passes with GCC.
@@ -66,7 +66,7 @@
 # The compilation flags of which the prefix is any of these regular expressions
 # will not be included in the output Clang command.
 # These flags should be ignored only in case the original compiler is gcc.
-IGNORED_OPTIONS_GCC = [
+IGNORED_OPTIONS_LIST_GCC = [
     # --- UNKNOWN BY CLANG --- #
     '-fallow-fetchr-insn',
     '-fcall-saved-',
@@ -191,8 +191,8 @@
     '-mabi'
 ]
 
-IGNORED_OPTIONS_GCC = re.compile('|'.join(IGNORED_OPTIONS_GCC))
-IGNORED_OPTIONS_CLANG = re.compile('|'.join(IGNORED_OPTIONS_CLANG))
+IGNORED_OPTIONS_GCC = re.compile('|'.join(IGNORED_OPTIONS_LIST_GCC))
+IGNORED_OPTIONS_CLANG = re.compile('|'.join(IGNORED_OPTIONS_LIST_CLANG))
 
 # The compilation flags of which the prefix is any of these regular expressions
 # will not be included in the output Clang command. These flags have further
@@ -218,7 +218,7 @@
 }
 
 
-COMPILE_OPTIONS = [
+COMPILE_OPTIONS_LIST = [
     '-nostdinc',
     r'-nostdinc\+\+',
     '-pedantic',
@@ -235,9 +235,9 @@
     '-pthread'
 ]
 
-COMPILE_OPTIONS = re.compile('|'.join(COMPILE_OPTIONS))
+COMPILE_OPTIONS = re.compile('|'.join(COMPILE_OPTIONS_LIST))
 
-COMPILE_OPTIONS_MERGED = [
+COMPILE_OPTIONS_LIST_MERGED = [
     '--sysroot',
     '-sdkroot',
     '--include',
@@ -253,7 +253,7 @@
     '-iwithprefixbefore'
 ]
 
-INCLUDE_OPTIONS_MERGED = [
+INCLUDE_OPTIONS_LIST_MERGED = [
     '-iquote',
     '-[IF]',
     '-isystem',
@@ -271,10 +271,10 @@
                         '-rewrite-objc']
 
 COMPILE_OPTIONS_MERGED = \
-    re.compile('(' + '|'.join(COMPILE_OPTIONS_MERGED) + ')')
+    re.compile('(' + '|'.join(COMPILE_OPTIONS_LIST_MERGED) + ')')
 
 INCLUDE_OPTIONS_MERGED = \
-    re.compile('(' + '|'.join(INCLUDE_OPTIONS_MERGED) + ')')
+    re.compile('(' + '|'.join(INCLUDE_OPTIONS_LIST_MERGED) + ')')
 
 
 PRECOMPILATION_OPTION = re.compile('-(E|M[G|T|Q|F|J|P|V|M]*)$')
@@ -344,14 +344,14 @@ def __hash__(self):
                 (self.compiler, self.language, tuple(self.compiler_flags)))
 
     compiler_info: Dict[ImplicitInfoSpecifierKey, dict] = {}
-    compiler_isexecutable = {}
+    compiler_isexecutable: Dict[str, bool] = {}
     # Store the already detected compiler version information.
     # If the value is False the compiler is not clang otherwise the value
     # should be a clang version information object.
-    compiler_versions = {}
+    compiler_versions: Dict[str, Any] = {}
 
     @staticmethod
-    def is_executable_compiler(compiler):
+    def is_executable_compiler(compiler: str):
         if compiler not in ImplicitCompilerInfo.compiler_isexecutable:
             ImplicitCompilerInfo.compiler_isexecutable[compiler] = \
                 which(compiler) is not None
@@ -405,7 +405,7 @@ def __parse_compiler_includes(compile_cmd: List[str]):
         start_mark = "#include <...> search starts here:"
         end_mark = "End of search list."
 
-        include_paths = []
+        include_paths: List[str] = []
         lines = ImplicitCompilerInfo.__get_compiler_err(compile_cmd)
 
         if not lines:
@@ -571,7 +571,7 @@ def load_compiler_info(file_path: str):
         for k, v in contents.items():
             k = json.loads(k)
             ICI.compiler_info[
-                ICI.ImplicitInfoSpecifierKey(k[0], k[1], tuple(k[2]))] = v
+                ICI.ImplicitInfoSpecifierKey(k[0], k[1], list(k[2]))] = v
 
     @staticmethod
     def set(details, compiler_info_file=None):
@@ -739,7 +739,7 @@ def __get_installed_dir(clang_binary) -> Optional[str]:
     if 'clang' not in clang_path.name:
         return None
 
-    return clang_path.parent
+    return str(clang_path.parent) if clang_path.parent else None
 
 
 def __collect_clang_compile_opts(flag_iterator, details):

analyzer/codechecker_analyzer/cli/checkers.py

@@ -15,7 +15,7 @@
 import os
 import sys
 from collections import defaultdict
-from typing import Dict, Iterable, List, Tuple
+from typing import Dict, Iterable, List, Tuple, Union
 
 from codechecker_report_converter import twodim
 
@@ -280,7 +280,7 @@ def __print_profiles(args: argparse.Namespace, cl: CheckerLabels):
 
     if 'details' in args:
         header = ['Profile name', 'Description']
-        rows = cl.get_description('profile').items()
+        rows: List[Tuple] = list(cl.get_description('profile').items())
     else:
         header = ['Profile name']
         rows = [(key,) for key in cl.get_description('profile')]
@@ -301,7 +301,7 @@ def __print_severities(args: argparse.Namespace, cl: CheckerLabels):
 
     if 'details' in args:
         header = ['Severity', 'Description']
-        rows = cl.get_description('severity').items()
+        rows: List[Tuple] = list(cl.get_description('severity').items())
     else:
         header = ['Severity']
         rows = [(key,) for key in cl.get_description('severity')]
@@ -330,7 +330,7 @@ def __print_guidelines(args: argparse.Namespace, cl: CheckerLabels):
         header = list(map(__uglify, header))
 
     if args.output_format == 'json':
-        rows = [(g, sorted(list(r))) for g, r in result.items()]
+        rows: List[Tuple] = [(g, sorted(list(r))) for g, r in result.items()]
     else:
         rows = [(g, ', '.join(sorted(r))) for g, r in result.items()]
 
@@ -475,7 +475,7 @@ def __print_checkers(args: argparse.Namespace, cl: CheckerLabels):
 
     checker_info = __get_detailed_checker_info(args, cl)
 
-    result = []
+    result: List[Tuple] = []
     for analyzer in args.analyzers:
         if labels:
             checkers = cl.checkers_by_labels(labels, analyzer)
@@ -501,7 +501,7 @@ def __print_checkers(args: argparse.Namespace, cl: CheckerLabels):
 
     if 'details' in args:
         header = ['Status', 'Name', 'Analyzer', 'Description', 'Labels']
-        rows = list(map(__format_row, result))
+        rows: Union[List[List], List[Tuple]] = list(map(__format_row, result))
     else:
         header = ['Name']
         rows = [[r[1]] for r in result]
@@ -535,7 +535,7 @@ def __print_checker_config(args: argparse.Namespace):
     if args.output_format in ['csv', 'json']:
         header = list(map(__uglify, header))
 
-    rows = []
+    rows: List[Tuple] = []
     analyzer_failures = []
     for analyzer in working_analyzers:
         analyzer_class = analyzer_types.supported_analyzers[analyzer]

analyzer/codechecker_analyzer/cli/parse.py

@@ -14,7 +14,7 @@
 import argparse
 import os
 import sys
-from typing import Dict, Optional, Set, List
+from typing import Dict, Optional, Set, List, Any
 import json
 import fnmatch
 
@@ -285,7 +285,11 @@ def get_report_dir_status(compile_commands: List[dict[str, str]],
                           report_dir: str,
                           detailed_flag: bool):
 
-    recent, old, failed, missing, analyzed_actions = {}, {}, {}, {}, {}
+    recent: Dict[str, Dict[str, int]] = {}
+    old: Dict[str, Dict[str, int]] = {}
+    failed: Dict[str, Dict[str, int]] = {}
+    missing: Dict[str, Dict[str, int]] = {}
+    analyzed_actions: Dict[str, int] = {}
 
     for analyzer in supported_analyzers:
         recent[analyzer] = {}
@@ -331,7 +335,7 @@ def get_report_dir_status(compile_commands: List[dict[str, str]],
         "failed": failed
     }
 
-    out_analyzers = {}
+    out_analyzers: Dict[str, Any] = {}
     for analyzer in supported_analyzers:
         detailed, summary = {}, {}