From ca06014c8de155d76b1da7eebb4be877cba40007 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20van=20Noord?= <13665637+DanielNoord@users.noreply.github.com> Date: Tue, 21 Dec 2021 12:57:44 +0100 Subject: Add typing to some functions in ``testutils`` (#5573) --- pylint/testutils/configuration_test.py | 2 +- pylint/testutils/functional/test_file.py | 4 ++-- pylint/testutils/get_test_info.py | 5 ++++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/pylint/testutils/configuration_test.py b/pylint/testutils/configuration_test.py index d878fae76..b0fd0b140 100644 --- a/pylint/testutils/configuration_test.py +++ b/pylint/testutils/configuration_test.py @@ -30,7 +30,7 @@ if not PY38_PLUS: def get_expected_or_default( tested_configuration_file: Union[str, Path], suffix: str, - default: ConfigurationValue, + default: str, ) -> str: """Return the expected value from the file if it exists, or the given default.""" expected = default diff --git a/pylint/testutils/functional/test_file.py b/pylint/testutils/functional/test_file.py index b25fe509b..bf2469e49 100644 --- a/pylint/testutils/functional/test_file.py +++ b/pylint/testutils/functional/test_file.py @@ -4,7 +4,7 @@ import configparser import sys from os.path import basename, exists, join -from typing import List, Tuple +from typing import Callable, Dict, List, Tuple, Union def parse_python_version(ver_str: str) -> Tuple[int, ...]: @@ -45,7 +45,7 @@ POSSIBLE_TEST_OPTIONS = { class FunctionalTestFile: """A single functional test case file with options.""" - _CONVERTERS = { + _CONVERTERS: Dict[str, Callable[[str], Union[Tuple[int, ...], List[str]]]] = { "min_pyver": parse_python_version, "max_pyver": parse_python_version, "min_pyver_end_position": parse_python_version, diff --git a/pylint/testutils/get_test_info.py b/pylint/testutils/get_test_info.py index 3b63a8e55..9900c7326 100644 --- a/pylint/testutils/get_test_info.py +++ b/pylint/testutils/get_test_info.py @@ -3,11 +3,14 @@ from glob import glob from os.path import basename, join, splitext +from typing import List, Tuple from pylint.testutils.constants import SYS_VERS_STR -def _get_tests_info(input_dir, msg_dir, prefix, suffix): +def _get_tests_info( + input_dir: str, msg_dir: str, prefix: str, suffix: str +) -> List[Tuple[str, str]]: """get python input examples and output messages We use following conventions for input files and messages: -- cgit v1.2.1