diff --git a/src/python/review/inspectors/base_inspector.py b/src/python/review/inspectors/base_inspector.py index 2fc92e93..032f6f60 100644 --- a/src/python/review/inspectors/base_inspector.py +++ b/src/python/review/inspectors/base_inspector.py @@ -1,6 +1,6 @@ import abc from pathlib import Path -from typing import List +from typing import Any, Dict, List from src.python.review.inspectors.inspector_type import InspectorType from src.python.review.inspectors.issue import BaseIssue @@ -30,5 +30,5 @@ def inspector_type(self) -> InspectorType: raise NotImplementedError('inspector_type property not implemented yet') @abc.abstractmethod - def inspect(self, path: Path, config: dict) -> List[BaseIssue]: + def inspect(self, path: Path, config: Dict[str, Any]) -> List[BaseIssue]: raise NotImplementedError('inspect method not implemented yet') diff --git a/src/python/review/inspectors/checkstyle/checkstyle.py b/src/python/review/inspectors/checkstyle/checkstyle.py index 57f809ec..0eafef7f 100644 --- a/src/python/review/inspectors/checkstyle/checkstyle.py +++ b/src/python/review/inspectors/checkstyle/checkstyle.py @@ -1,6 +1,6 @@ import logging from pathlib import Path -from typing import List +from typing import Any, Dict, List from src.python.review.common.file_system import new_temp_dir from src.python.review.common.subprocess_runner import run_in_subprocess @@ -42,7 +42,7 @@ def _create_command(cls, path: Path, output_path: Path) -> List[str]: '-f', 'xml', '-o', output_path, str(path), ] - def inspect(self, path: Path, config: dict) -> List[BaseIssue]: + def inspect(self, path: Path, config: Dict[str, Any]) -> List[BaseIssue]: with new_temp_dir() as temp_dir: output_path = temp_dir / 'output.xml' command = self._create_command(path, output_path) diff --git a/src/python/review/inspectors/detekt/detekt.py b/src/python/review/inspectors/detekt/detekt.py index 041c6b2d..f9a9bdec 100644 --- a/src/python/review/inspectors/detekt/detekt.py +++ b/src/python/review/inspectors/detekt/detekt.py @@ -1,6 +1,6 @@ import logging from pathlib import Path -from typing import List +from typing import Any, Dict, List from src.python.review.common.file_system import new_temp_dir from src.python.review.common.subprocess_runner import run_in_subprocess @@ -41,7 +41,7 @@ def _create_command(cls, path: Path, output_path: Path): '--input', str(path), ] - def inspect(self, path: Path, config: dict) -> List[BaseIssue]: + def inspect(self, path: Path, config: Dict[str, Any]) -> List[BaseIssue]: with new_temp_dir() as temp_dir: output_path = temp_dir / 'output.xml' command = self._create_command(path, output_path) diff --git a/src/python/review/inspectors/eslint/eslint.py b/src/python/review/inspectors/eslint/eslint.py index c7d0b1b4..0d4736d4 100644 --- a/src/python/review/inspectors/eslint/eslint.py +++ b/src/python/review/inspectors/eslint/eslint.py @@ -1,5 +1,5 @@ from pathlib import Path -from typing import List +from typing import Any, Dict, List from src.python.review.common.file_system import new_temp_dir from src.python.review.common.subprocess_runner import run_in_subprocess @@ -32,7 +32,7 @@ def _create_command(cls, path: Path, output_path: Path) -> List[str]: path, ] - def inspect(self, path: Path, config: dict) -> List[BaseIssue]: + def inspect(self, path: Path, config: Dict[str, Any]) -> List[BaseIssue]: with new_temp_dir() as temp_dir: output_path = temp_dir / 'output.xml' command = self._create_command(path, output_path) diff --git a/src/python/review/inspectors/flake8/flake8.py b/src/python/review/inspectors/flake8/flake8.py index 7eb75a9d..a427cb14 100644 --- a/src/python/review/inspectors/flake8/flake8.py +++ b/src/python/review/inspectors/flake8/flake8.py @@ -1,7 +1,7 @@ import logging import re from pathlib import Path -from typing import List +from typing import Any, Dict, List from src.python.review.common.subprocess_runner import run_in_subprocess from src.python.review.inspectors.base_inspector import BaseInspector @@ -34,7 +34,7 @@ class Flake8Inspector(BaseInspector): inspector_type = InspectorType.FLAKE8 @classmethod - def inspect(cls, path: Path, config: dict) -> List[BaseIssue]: + def inspect(cls, path: Path, config: Dict[str, Any]) -> List[BaseIssue]: command = [ 'flake8', f'--format={FORMAT}', diff --git a/src/python/review/inspectors/intellij/intellij.py b/src/python/review/inspectors/intellij/intellij.py index b50dc0ca..360cb089 100644 --- a/src/python/review/inspectors/intellij/intellij.py +++ b/src/python/review/inspectors/intellij/intellij.py @@ -2,7 +2,7 @@ import os import re from pathlib import Path -from typing import Dict, List, Optional, Union +from typing import Any, Dict, List, Optional, Union from xml.etree import ElementTree from src.python.review.common.file_system import get_all_file_system_items, new_temp_dir @@ -51,7 +51,7 @@ def create_command(output_dir_path) -> List[Union[str, Path]]: INTELLIJ_INSPECTOR_SETTINGS, output_dir_path, '-v2', ] - def inspect(self, path: Path, config: dict) -> List[BaseIssue]: + def inspect(self, path: Path, config: Dict[str, Any]) -> List[BaseIssue]: path_in_project_to_origin_path = self.copy_files_to_project(path) try: diff --git a/src/python/review/inspectors/pmd/pmd.py b/src/python/review/inspectors/pmd/pmd.py index eb4878dd..6f6f1b08 100644 --- a/src/python/review/inspectors/pmd/pmd.py +++ b/src/python/review/inspectors/pmd/pmd.py @@ -2,7 +2,7 @@ import logging import os from pathlib import Path -from typing import List +from typing import Any, Dict, List from src.python.review.application_config import LanguageVersion from src.python.review.common.file_system import new_temp_dir @@ -42,7 +42,7 @@ def _create_command(cls, path: Path, '-t', str(n_cpu), ] - def inspect(self, path: Path, config: dict) -> List[BaseIssue]: + def inspect(self, path: Path, config: Dict[str, Any]) -> List[BaseIssue]: with new_temp_dir() as temp_dir: output_path = Path(temp_dir / 'out.csv') diff --git a/src/python/review/inspectors/pyast/python_ast.py b/src/python/review/inspectors/pyast/python_ast.py index 58fc1bdd..77cdb8d1 100644 --- a/src/python/review/inspectors/pyast/python_ast.py +++ b/src/python/review/inspectors/pyast/python_ast.py @@ -1,7 +1,7 @@ import ast from collections import Counter, defaultdict from pathlib import Path -from typing import Dict, List +from typing import Any, Dict, List from src.python.review.common import language from src.python.review.common.file_system import get_all_file_system_items @@ -109,7 +109,7 @@ class PythonAstInspector(BaseInspector): inspector_type = InspectorType.PYTHON_AST @classmethod - def inspect(cls, path: Path, config: dict) -> List[BaseIssue]: + def inspect(cls, path: Path, config: Dict[str, Any]) -> List[BaseIssue]: if path.is_file(): path_to_files = [path] else: diff --git a/src/python/review/inspectors/pylint/pylint.py b/src/python/review/inspectors/pylint/pylint.py index e5a256cb..a8430d05 100644 --- a/src/python/review/inspectors/pylint/pylint.py +++ b/src/python/review/inspectors/pylint/pylint.py @@ -1,7 +1,7 @@ import logging import re from pathlib import Path -from typing import List, Optional +from typing import Any, Dict, List, Optional from src.python.review.common.subprocess_runner import run_in_subprocess from src.python.review.inspectors.base_inspector import BaseInspector @@ -25,7 +25,7 @@ class PylintInspector(BaseInspector): ) @classmethod - def inspect(cls, path: Path, config: dict) -> List[CodeIssue]: + def inspect(cls, path: Path, config: Dict[str, Any]) -> List[CodeIssue]: command = [ 'pylint', '--load-plugins', 'pylint_django', diff --git a/src/python/review/inspectors/radon/radon.py b/src/python/review/inspectors/radon/radon.py index a5153fc1..4d7466fa 100644 --- a/src/python/review/inspectors/radon/radon.py +++ b/src/python/review/inspectors/radon/radon.py @@ -1,6 +1,6 @@ import re from pathlib import Path -from typing import List +from typing import Any, Dict, List from src.python.review.common.subprocess_runner import run_in_subprocess from src.python.review.inspectors.base_inspector import BaseInspector @@ -17,7 +17,7 @@ class RadonInspector(BaseInspector): inspector_type = InspectorType.RADON @classmethod - def inspect(cls, path: Path, config: dict) -> List[BaseIssue]: + def inspect(cls, path: Path, config: Dict[str, Any]) -> List[BaseIssue]: mi_command = [ 'radon', 'mi', # compute the Maintainability Index score '--max', 'F', # set the maximum MI rank to display diff --git a/src/python/review/inspectors/spotbugs/spotbugs.py b/src/python/review/inspectors/spotbugs/spotbugs.py index a2ee8b38..c4580034 100644 --- a/src/python/review/inspectors/spotbugs/spotbugs.py +++ b/src/python/review/inspectors/spotbugs/spotbugs.py @@ -2,7 +2,7 @@ import re from collections import Counter from pathlib import Path -from typing import Dict, List +from typing import Any, Dict, List from src.python.review.common.file_system import get_all_file_system_items from src.python.review.common.java_compiler import javac, javac_project @@ -33,7 +33,7 @@ def _create_command(cls, path: Path) -> List[str]: str(path), ] - def inspect(self, path: Path, config: dict) -> List[BaseIssue]: + def inspect(self, path: Path, config: Dict[str, Any]) -> List[BaseIssue]: if path.is_file(): is_successful = javac(path) else: diff --git a/src/python/review/inspectors/springlint/springlint.py b/src/python/review/inspectors/springlint/springlint.py index b5eca5a4..d6dd748b 100644 --- a/src/python/review/inspectors/springlint/springlint.py +++ b/src/python/review/inspectors/springlint/springlint.py @@ -82,7 +82,7 @@ def _create_command(cls, path: Path, output_path: Path) -> List[str]: '--project', str(path), ] - def inspect(self, path: Path, config: dict) -> List[BaseIssue]: + def inspect(self, path: Path, config: Dict[str, Any]) -> List[BaseIssue]: with new_temp_dir() as temp_dir: if path.is_file(): return self._inspect_file(path, temp_dir)