Merge branch 'main' of https://github.com/PyCQA/pylint into pyannotat…

…e-pylint
pylint-dev · Pierre-Sassoulas · Sep 16, 2021 · Sep 7, 2021 · Sep 7, 2021 · Sep 14, 2021
commit 48592881f08b9901c67ad3bc8e0bb8f31359b7e6
diff --git a/pylint/lint/parallel.py b/pylint/lint/parallel.py
@@ -3,12 +3,15 @@
 
 import collections
 import functools
-from typing import Any, DefaultDict, Iterable, List, Tuple
+from typing import Any, DefaultDict, Iterable, List, Tuple, TYPE_CHECKING, Dict, Union
 
 from pylint import reporters
 from pylint.lint.utils import _patch_sys_path
 from pylint.message import Message
-from pylint.typing import FileItem
+from pylint.typing import CheckerStats, FileItem
+
+if TYPE_CHECKING:
+    from typing import Counter  # typing.Counter added in Python 3.6.1
 
 try:
     import multiprocessing

diff --git a/pylint/lint/pylinter.py b/pylint/lint/pylinter.py
@@ -32,7 +32,7 @@
 )
 from pylint.message import MessageDefinitionStore, MessagesHandlerMixIn
 from pylint.reporters.ureports import nodes as report_nodes
-from pylint.typing import FileItem, ModuleDescriptionDict
+from pylint.typing import FileItem, ModuleDescriptionDict, CheckerStats
 from pylint.utils import ASTWalker, FileState, utils
 from pylint.utils.pragma_parser import (
     OPTION_PO,

diff --git a/pylint/reporters/multi_reporter.py b/pylint/reporters/multi_reporter.py
@@ -3,7 +3,7 @@
 
 
 import os
-from typing import IO, Any, AnyStr, Callable, List, Mapping, Optional
+from typing import IO, Any, AnyStr, Callable, List, Optional
 
 from pylint.interfaces import IReporter
 from pylint.message import Message

@@ -3,7 +3,10 @@
 
 """A collection of typing utilities."""
 import sys
-from typing import NamedTuple, Union
+from typing import NamedTuple, Union, TYPE_CHECKING, Dict, List
+
+if TYPE_CHECKING:
+    from typing import Counter  # typing.Counter added in Python 3.6.1
 
 if sys.version_info >= (3, 8):
     from typing import Literal, TypedDict
@@ -35,3 +38,9 @@ class ErrorDescriptionDict(TypedDict):
     key: Literal["fatal"]
     mod: str
     ex: Union[ImportError, SyntaxError]
+
+
+# The base type of the "stats" attribute of a checker
+CheckerStats = Dict[
+    str, Union[int, "Counter[str]", List, Dict[str, Union[int, str, Dict[str, int]]]]
+]
diff --git a/tests/test_check_parallel.py b/tests/test_check_parallel.py
@@ -24,7 +24,7 @@
 from pylint.lint.parallel import _worker_initialize as worker_initialize
 from pylint.lint.parallel import check_parallel
 from pylint.testutils import GenericTestReporter as Reporter
-from pylint.typing import FileItem
+from pylint.typing import FileItem, CheckerStats
 
 
 def _gen_file_data(idx: int = 0) -> FileItem: