Use python-typing-update on pylint/utils and message dirs

Author: DanielNoord

pylint/message/message_definition.py

@@ -2,8 +2,10 @@
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
 # Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
+from __future__ import annotations
+
 import sys
-from typing import TYPE_CHECKING, Any, List, Optional, Tuple
+from typing import TYPE_CHECKING, Any
 
 from astroid import nodes
 
@@ -18,15 +20,15 @@
 class MessageDefinition:
     def __init__(
         self,
-        checker: "BaseChecker",
+        checker: BaseChecker,
         msgid: str,
         msg: str,
         description: str,
         symbol: str,
         scope: str,
-        minversion: Optional[Tuple[int, int]] = None,
-        maxversion: Optional[Tuple[int, int]] = None,
-        old_names: Optional[List[Tuple[str, str]]] = None,
+        minversion: tuple[int, int] | None = None,
+        maxversion: tuple[int, int] | None = None,
+        old_names: list[tuple[str, str]] | None = None,
     ) -> None:
         self.checker_name = checker.name
         self.check_msgid(msgid)
@@ -37,7 +39,7 @@ def __init__(
         self.scope = scope
         self.minversion = minversion
         self.maxversion = maxversion
-        self.old_names: List[Tuple[str, str]] = []
+        self.old_names: list[tuple[str, str]] = []
         if old_names:
             for old_msgid, old_symbol in old_names:
                 self.check_msgid(old_msgid)
@@ -100,7 +102,7 @@ def format_help(self, checkerref: bool = False) -> str:
         return f":{message_id}:\n{msg_help}"
 
     def check_message_definition(
-        self, line: Optional[int], node: Optional[nodes.NodeNG]
+        self, line: int | None, node: nodes.NodeNG | None
     ) -> None:
         """Check MessageDefinition for possible errors."""
         if self.msgid[0] not in _SCOPE_EXEMPT:

pylint/message/message_definition_store.py

@@ -2,9 +2,11 @@
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
 # Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
+from __future__ import annotations
+
 import collections
 import functools
-from typing import TYPE_CHECKING, Dict, List, Tuple, ValuesView
+from typing import TYPE_CHECKING, ValuesView
 
 from pylint.exceptions import UnknownMessageError
 from pylint.message.message_definition import MessageDefinition
@@ -25,16 +27,16 @@ def __init__(self) -> None:
         # Primary registry for all active messages definitions.
         # It contains the 1:1 mapping from msgid to MessageDefinition.
         # Keys are msgid, values are MessageDefinition
-        self._messages_definitions: Dict[str, MessageDefinition] = {}
+        self._messages_definitions: dict[str, MessageDefinition] = {}
         # MessageDefinition kept by category
-        self._msgs_by_category: Dict[str, List[str]] = collections.defaultdict(list)
+        self._msgs_by_category: dict[str, list[str]] = collections.defaultdict(list)
 
     @property
     def messages(self) -> ValuesView[MessageDefinition]:
         """The list of all active messages."""
         return self._messages_definitions.values()
 
-    def register_messages_from_checker(self, checker: "BaseChecker") -> None:
+    def register_messages_from_checker(self, checker: BaseChecker) -> None:
         """Register all messages definitions from a checker."""
         checker.check_consistency()
         for message in checker.messages:
@@ -53,7 +55,7 @@ def register_message(self, message: MessageDefinition) -> None:
     # risk of creating a large memory leak.
     # See discussion in: https://github.com/PyCQA/pylint/pull/5673
     @functools.lru_cache(maxsize=None)  # pylint: disable=cache-max-size-none
-    def get_message_definitions(self, msgid_or_symbol: str) -> List[MessageDefinition]:
+    def get_message_definitions(self, msgid_or_symbol: str) -> list[MessageDefinition]:
         """Returns the Message definition for either a numeric or symbolic id.
 
         The cache has no limit as its size will likely stay minimal. For each message we store
@@ -72,7 +74,7 @@ def get_msg_display_string(self, msgid_or_symbol: str) -> str:
             return repr(message_definitions[0].symbol)
         return repr([md.symbol for md in message_definitions])
 
-    def help_message(self, msgids_or_symbols: List[str]) -> None:
+    def help_message(self, msgids_or_symbols: list[str]) -> None:
         """Display help messages for the given message identifiers."""
         for msgids_or_symbol in msgids_or_symbols:
             try:
@@ -99,7 +101,7 @@ def list_messages(self) -> None:
 
     def find_emittable_messages(
         self,
-    ) -> Tuple[List[MessageDefinition], List[MessageDefinition]]:
+    ) -> tuple[list[MessageDefinition], list[MessageDefinition]]:
         """Finds all emittable and non-emittable messages."""
         messages = sorted(self._messages_definitions.values(), key=lambda m: m.msgid)
         emittable = []

pylint/message/message_id_store.py

@@ -2,7 +2,9 @@
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
 # Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
-from typing import Dict, List, NoReturn, Optional, Tuple
+from __future__ import annotations
+
+from typing import NoReturn
 
 from pylint.exceptions import InvalidMessageError, UnknownMessageError
 
@@ -12,10 +14,10 @@ class MessageIdStore:
     """The MessageIdStore store MessageId and make sure that there is a 1-1 relation between msgid and symbol."""
 
     def __init__(self) -> None:
-        self.__msgid_to_symbol: Dict[str, str] = {}
-        self.__symbol_to_msgid: Dict[str, str] = {}
-        self.__old_names: Dict[str, List[str]] = {}
-        self.__active_msgids: Dict[str, List[str]] = {}
+        self.__msgid_to_symbol: dict[str, str] = {}
+        self.__symbol_to_msgid: dict[str, str] = {}
+        self.__old_names: dict[str, list[str]] = {}
+        self.__active_msgids: dict[str, list[str]] = {}
 
     def __len__(self) -> int:
         return len(self.__msgid_to_symbol)
@@ -42,7 +44,7 @@ def get_msgid(self, symbol: str) -> str:
             raise UnknownMessageError(msg) from e
 
     def register_message_definition(
-        self, msgid: str, symbol: str, old_names: List[Tuple[str, str]]
+        self, msgid: str, symbol: str, old_names: list[tuple[str, str]]
     ) -> None:
         self.check_msgid_and_symbol(msgid, symbol)
         self.add_msgid_and_symbol(msgid, symbol)
@@ -74,8 +76,8 @@ def add_legacy_msgid_and_symbol(
         self.__old_names[msgid] = existing_old_names
 
     def check_msgid_and_symbol(self, msgid: str, symbol: str) -> None:
-        existing_msgid: Optional[str] = self.__symbol_to_msgid.get(symbol)
-        existing_symbol: Optional[str] = self.__msgid_to_symbol.get(msgid)
+        existing_msgid: str | None = self.__symbol_to_msgid.get(symbol)
+        existing_symbol: str | None = self.__msgid_to_symbol.get(msgid)
         if existing_symbol is None and existing_msgid is None:
             return  # both symbol and msgid are usable
         if existing_msgid is not None:
@@ -106,7 +108,7 @@ def _raise_duplicate_msgid(symbol: str, msgid: str, other_msgid: str) -> NoRetur
         )
         raise InvalidMessageError(error_message)
 
-    def get_active_msgids(self, msgid_or_symbol: str) -> List[str]:
+    def get_active_msgids(self, msgid_or_symbol: str) -> list[str]:
         """Return msgids but the input can be a symbol.
 
         self.__active_msgids is used to implement a primitive cache for this function.
@@ -117,7 +119,7 @@ def get_active_msgids(self, msgid_or_symbol: str) -> List[str]:
             pass
 
         # If we don't have a cached value yet we compute it
-        msgid: Optional[str]
+        msgid: str | None
         if msgid_or_symbol[1:].isdigit():
             # Only msgid can have a digit as second letter
             msgid = msgid_or_symbol.upper()

pylint/utils/docs.py

@@ -4,9 +4,11 @@
 
 """Various helper functions to create the docs of a linter object."""
 
+from __future__ import annotations
+
 import sys
 import warnings
-from typing import TYPE_CHECKING, Dict, TextIO
+from typing import TYPE_CHECKING, TextIO
 
 from pylint.constants import MAIN_CHECKER_NAME
 from pylint.utils.utils import get_rst_section, get_rst_title
@@ -15,9 +17,9 @@
     from pylint.lint.pylinter import PyLinter
 
 
-def _get_checkers_infos(linter: "PyLinter") -> Dict[str, Dict]:
+def _get_checkers_infos(linter: PyLinter) -> dict[str, dict]:
     """Get info from a checker and handle KeyError."""
-    by_checker: Dict[str, Dict] = {}
+    by_checker: dict[str, dict] = {}
     for checker in linter.get_checkers():
         name = checker.name
         if name != "master":
@@ -40,7 +42,7 @@ def _get_checkers_infos(linter: "PyLinter") -> Dict[str, Dict]:
     return by_checker
 
 
-def _get_checkers_documentation(linter: "PyLinter") -> str:
+def _get_checkers_documentation(linter: PyLinter) -> str:
     """Get documentation for individual checkers."""
     result = get_rst_title("Pylint global options and switches", "-")
     result += """
@@ -81,6 +83,6 @@ def _get_checkers_documentation(linter: "PyLinter") -> str:
     return result
 
 
-def print_full_documentation(linter: "PyLinter", stream: TextIO = sys.stdout) -> None:
+def print_full_documentation(linter: PyLinter, stream: TextIO = sys.stdout) -> None:
     """Output a full documentation in ReST format."""
     print(_get_checkers_documentation(linter)[:-1], file=stream)

pylint/utils/file_state.py

@@ -2,18 +2,11 @@
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
 # Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
+from __future__ import annotations
+
 import collections
 import sys
-from typing import (
-    TYPE_CHECKING,
-    DefaultDict,
-    Dict,
-    Iterator,
-    Optional,
-    Set,
-    Tuple,
-    Union,
-)
+from typing import TYPE_CHECKING, DefaultDict, Dict, Iterator
 
 from astroid import nodes
 
@@ -38,18 +31,18 @@
 class FileState:
     """Hold internal state specific to the currently analyzed file."""
 
-    def __init__(self, modname: Optional[str] = None) -> None:
+    def __init__(self, modname: str | None = None) -> None:
         self.base_name = modname
         self._module_msgs_state: MessageStateDict = {}
         self._raw_module_msgs_state: MessageStateDict = {}
         self._ignored_msgs: DefaultDict[
-            Tuple[str, int], Set[int]
+            tuple[str, int], set[int]
         ] = collections.defaultdict(set)
-        self._suppression_mapping: Dict[Tuple[str, int], int] = {}
-        self._effective_max_line_number: Optional[int] = None
+        self._suppression_mapping: dict[tuple[str, int], int] = {}
+        self._effective_max_line_number: int | None = None
 
     def collect_block_lines(
-        self, msgs_store: "MessageDefinitionStore", module_node: nodes.Module
+        self, msgs_store: MessageDefinitionStore, module_node: nodes.Module
     ) -> None:
         """Walk the AST to collect block level options line numbers."""
         for msg, lines in self._module_msgs_state.items():
@@ -62,7 +55,7 @@ def collect_block_lines(
 
     def _collect_block_lines(
         self,
-        msgs_store: "MessageDefinitionStore",
+        msgs_store: MessageDefinitionStore,
         node: nodes.NodeNG,
         msg_state: MessageStateDict,
     ) -> None:
@@ -126,7 +119,7 @@ def _collect_block_lines(
                         self._module_msgs_state[msgid] = {line: state}
                 del lines[lineno]
 
-    def set_msg_status(self, msg: "MessageDefinition", line: int, status: bool) -> None:
+    def set_msg_status(self, msg: MessageDefinition, line: int, status: bool) -> None:
         """Set status (enabled/disable) for a given message at a given line."""
         assert line > 0
         try:
@@ -135,7 +128,7 @@ def set_msg_status(self, msg: "MessageDefinition", line: int, status: bool) -> N
             self._module_msgs_state[msg.msgid] = {line: status}
 
     def handle_ignored_message(
-        self, state_scope: Optional[Literal[0, 1, 2]], msgid: str, line: Optional[int]
+        self, state_scope: Literal[0, 1, 2] | None, msgid: str, line: int | None
     ) -> None:
         """Report an ignored message.
 
@@ -154,12 +147,12 @@ def handle_ignored_message(
 
     def iter_spurious_suppression_messages(
         self,
-        msgs_store: "MessageDefinitionStore",
+        msgs_store: MessageDefinitionStore,
     ) -> Iterator[
-        Tuple[
+        tuple[
             Literal["useless-suppression", "suppressed-message"],
             int,
-            Union[Tuple[str], Tuple[str, int]],
+            tuple[str] | tuple[str, int],
         ]
     ]:
         for warning, lines in self._raw_module_msgs_state.items():
@@ -180,5 +173,5 @@ def iter_spurious_suppression_messages(
                     from_,
                 )
 
-    def get_effective_max_line_number(self) -> Optional[int]:
+    def get_effective_max_line_number(self) -> int | None:
         return self._effective_max_line_number

pylint/utils/linterstats.py

@@ -2,8 +2,10 @@
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
 # Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
+from __future__ import annotations
+
 import sys
-from typing import Dict, List, Optional, Set, cast
+from typing import cast
 
 from pylint.typing import MessageTypesFullName
 
@@ -83,14 +85,14 @@ class LinterStats:
 
     def __init__(
         self,
-        bad_names: Optional[BadNames] = None,
-        by_module: Optional[Dict[str, ModuleStats]] = None,
-        by_msg: Optional[Dict[str, int]] = None,
-        code_type_count: Optional[CodeTypeCount] = None,
-        dependencies: Optional[Dict[str, Set[str]]] = None,
-        duplicated_lines: Optional[DuplicatedLines] = None,
-        node_count: Optional[NodeCount] = None,
-        undocumented: Optional[UndocumentedNodes] = None,
+        bad_names: BadNames | None = None,
+        by_module: dict[str, ModuleStats] | None = None,
+        by_msg: dict[str, int] | None = None,
+        code_type_count: CodeTypeCount | None = None,
+        dependencies: dict[str, set[str]] | None = None,
+        duplicated_lines: DuplicatedLines | None = None,
+        node_count: NodeCount | None = None,
+        undocumented: UndocumentedNodes | None = None,
     ) -> None:
         self.bad_names = bad_names or BadNames(
             argument=0,
@@ -106,13 +108,13 @@ def __init__(
             variable=0,
             typevar=0,
         )
-        self.by_module: Dict[str, ModuleStats] = by_module or {}
-        self.by_msg: Dict[str, int] = by_msg or {}
+        self.by_module: dict[str, ModuleStats] = by_module or {}
+        self.by_msg: dict[str, int] = by_msg or {}
         self.code_type_count = code_type_count or CodeTypeCount(
             code=0, comment=0, docstring=0, empty=0, total=0
         )
 
-        self.dependencies: Dict[str, Set[str]] = dependencies or {}
+        self.dependencies: dict[str, set[str]] = dependencies or {}
         self.duplicated_lines = duplicated_lines or DuplicatedLines(
             nb_duplicated_lines=0, percent_duplicated_lines=0.0
         )
@@ -309,7 +311,7 @@ def reset_message_count(self) -> None:
         self.warning = 0
 
 
-def merge_stats(stats: List[LinterStats]):
+def merge_stats(stats: list[LinterStats]):
     """Used to merge multiple stats objects into a new one when pylint is run in parallel mode."""
     merged = LinterStats()
     for stat in stats: