ruff check pylint --fix --unsafe-fixes

Author: jacobtylerwalls

doc/exts/pylint_messages.py

@@ -12,7 +12,7 @@
 from inspect import getmodule
 from itertools import chain, groupby
 from pathlib import Path
-from typing import DefaultDict, Dict, List, NamedTuple, Tuple
+from typing import NamedTuple
 
 from sphinx.application import Sphinx
 
@@ -52,8 +52,8 @@ class ExampleType(str, Enum):
     BAD = "bad"
 
 
-MessagesDict = Dict[str, List[MessageData]]
-OldMessagesDict = Dict[str, DefaultDict[Tuple[str, str], List[Tuple[str, str]]]]
+MessagesDict = dict[str, list[MessageData]]
+OldMessagesDict = dict[str, defaultdict[tuple[str, str], list[tuple[str, str]]]]
 """DefaultDict is indexed by tuples of (old name symbol, old name id) and values are
 tuples of (new name symbol, new name category).
 """

doc/exts/pylint_options.py

@@ -10,7 +10,7 @@
 from collections import defaultdict
 from inspect import getmodule
 from pathlib import Path
-from typing import Dict, List, NamedTuple
+from typing import NamedTuple
 
 import tomlkit
 from sphinx.application import Sphinx
@@ -30,7 +30,7 @@ class OptionsData(NamedTuple):
     extension: bool
 
 
-OptionsDataDict = Dict[str, List[OptionsData]]
+OptionsDataDict = dict[str, list[OptionsData]]
 
 PYLINT_BASE_PATH = Path(__file__).resolve().parent.parent.parent
 """Base path to the project folder."""

pylint/checkers/base/name_checker/checker.py

@@ -14,7 +14,7 @@
 from collections.abc import Iterable
 from enum import Enum, auto
 from re import Pattern
-from typing import TYPE_CHECKING, Tuple
+from typing import TYPE_CHECKING
 
 import astroid
 from astroid import nodes
@@ -34,7 +34,7 @@
 if TYPE_CHECKING:
     from pylint.lint.pylinter import PyLinter
 
-_BadNamesTuple = Tuple[nodes.NodeNG, str, str, interfaces.Confidence]
+_BadNamesTuple = tuple[nodes.NodeNG, str, str, interfaces.Confidence]
 
 # Default patterns for name types that do not have styles
 DEFAULT_PATTERNS = {

pylint/checkers/imports.py

@@ -13,7 +13,7 @@
 from collections import defaultdict
 from collections.abc import ItemsView, Sequence
 from functools import cached_property
-from typing import TYPE_CHECKING, Any, Dict, List, Union
+from typing import TYPE_CHECKING, Any, Union
 
 import astroid
 from astroid import nodes
@@ -43,7 +43,7 @@
 
 # The dictionary with Any should actually be a _ImportTree again
 # but mypy doesn't support recursive types yet
-_ImportTree = Dict[str, Union[List[Dict[str, Any]], List[str]]]
+_ImportTree = dict[str, Union[list[dict[str, Any]], list[str]]]
 
 DEPRECATED_MODULES = {
     (0, 0, 0): {"tkinter.tix", "fpectl"},

pylint/checkers/stdlib.py

@@ -8,7 +8,7 @@
 
 import sys
 from collections.abc import Iterable
-from typing import TYPE_CHECKING, Any, Dict, Set, Tuple
+from typing import TYPE_CHECKING, Any
 
 import astroid
 from astroid import nodes, util
@@ -22,7 +22,7 @@
 if TYPE_CHECKING:
     from pylint.lint import PyLinter
 
-DeprecationDict = Dict[Tuple[int, int, int], Set[str]]
+DeprecationDict = dict[tuple[int, int, int], set[str]]
 
 OPEN_FILES_MODE = ("open", "file")
 OPEN_FILES_FUNCS = (*OPEN_FILES_MODE, "read_text", "write_text")

pylint/checkers/symilar.py

@@ -42,17 +42,7 @@
 from getopt import GetoptError, getopt
 from io import BufferedIOBase, BufferedReader, BytesIO
 from itertools import chain
-from typing import (
-    TYPE_CHECKING,
-    Dict,
-    List,
-    NamedTuple,
-    NewType,
-    NoReturn,
-    TextIO,
-    Tuple,
-    Union,
-)
+from typing import TYPE_CHECKING, NamedTuple, NewType, NoReturn, TextIO, Union
 
 import astroid
 from astroid import nodes
@@ -84,10 +74,10 @@ class LineSpecifs(NamedTuple):
 
 # Links LinesChunk object to the starting indices (in lineset's stripped lines)
 # of the different chunk of lines that are used to compute the hash
-HashToIndex_T = Dict["LinesChunk", List[Index]]
+HashToIndex_T = dict["LinesChunk", list[Index]]
 
 # Links index in the lineset's stripped lines to the real lines in the file
-IndexToLines_T = Dict[Index, "SuccessiveLinesLimits"]
+IndexToLines_T = dict[Index, "SuccessiveLinesLimits"]
 
 # The types the streams read by pylint can take. Originating from astroid.nodes.Module.stream() and open()
 STREAM_TYPES = Union[TextIO, BufferedReader, BytesIO]
@@ -113,7 +103,7 @@ def __init__(
 
 # Links the indices to the starting line in both lineset's stripped lines to
 # the start and end lines in both files
-CplIndexToCplLines_T = Dict["LineSetStartCouple", CplSuccessiveLinesLimits]
+CplIndexToCplLines_T = dict["LineSetStartCouple", CplSuccessiveLinesLimits]
 
 
 class LinesChunk:
@@ -212,7 +202,7 @@ def increment(self, value: Index) -> LineSetStartCouple:
         )
 
 
-LinesChunkLimits_T = Tuple["LineSet", LineNumber, LineNumber]
+LinesChunkLimits_T = tuple["LineSet", LineNumber, LineNumber]
 
 
 def hash_lineset(

pylint/config/argument.py

@@ -13,9 +13,10 @@
 import os
 import pathlib
 import re
-from collections.abc import Callable
+from collections.abc import Callable, Sequence
 from glob import glob
-from typing import Any, Literal, Pattern, Sequence, Tuple, Union
+from re import Pattern
+from typing import Any, Literal, Union
 
 from pylint import interfaces
 from pylint import utils as pylint_utils
@@ -30,7 +31,7 @@
     Pattern[str],
     Sequence[str],
     Sequence[Pattern[str]],
-    Tuple[int, ...],
+    tuple[int, ...],
 ]
 """List of possible argument types."""
 

pylint/config/config_file_parser.py

@@ -10,7 +10,7 @@
 import os
 import sys
 from pathlib import Path
-from typing import TYPE_CHECKING, Dict, List, Tuple
+from typing import TYPE_CHECKING
 
 from pylint.config.utils import _parse_rich_type_value
 
@@ -22,7 +22,7 @@
 if TYPE_CHECKING:
     from pylint.lint import PyLinter
 
-PylintConfigFileData = Tuple[Dict[str, str], List[str]]
+PylintConfigFileData = tuple[dict[str, str], list[str]]
 
 
 class _RawConfParser:

pylint/extensions/code_style.py

@@ -5,7 +5,7 @@
 from __future__ import annotations
 
 import sys
-from typing import TYPE_CHECKING, Tuple, Type, cast
+from typing import TYPE_CHECKING, cast
 
 from astroid import nodes
 
@@ -152,7 +152,7 @@ def _check_dict_consider_namedtuple_dataclass(self, node: nodes.Dict) -> None:
         if len(node.items) > 1 and all(
             isinstance(dict_value, nodes.Dict) for _, dict_value in node.items
         ):
-            KeyTupleT = Tuple[Type[nodes.NodeNG], str]
+            KeyTupleT = tuple[type[nodes.NodeNG], str]
 
             # Makes sure all keys are 'Const' string nodes
             keys_checked: set[KeyTupleT] = set()

pylint/message/_deleted_message_ids.py

@@ -4,7 +4,7 @@
 
 from __future__ import annotations
 
-from functools import lru_cache
+from functools import cache
 from typing import NamedTuple
 
 
@@ -131,7 +131,7 @@ class DeletedMessage(NamedTuple):
 }
 
 
-@lru_cache(maxsize=None)
+@cache
 def is_deleted_symbol(symbol: str) -> str | None:
     """Return the explanation for removal if the message was removed."""
     for explanation, deleted_messages in DELETED_MESSAGES_IDS.items():
@@ -143,7 +143,7 @@ def is_deleted_symbol(symbol: str) -> str | None:
     return None
 
 
-@lru_cache(maxsize=None)
+@cache
 def is_deleted_msgid(msgid: str) -> str | None:
     """Return the explanation for removal if the message was removed."""
     for explanation, deleted_messages in DELETED_MESSAGES_IDS.items():
@@ -155,7 +155,7 @@ def is_deleted_msgid(msgid: str) -> str | None:
     return None
 
 
-@lru_cache(maxsize=None)
+@cache
 def is_moved_symbol(symbol: str) -> str | None:
     """Return the explanation for moving if the message was moved to extensions."""
     for explanation, moved_messages in MOVED_TO_EXTENSIONS.items():
@@ -167,7 +167,7 @@ def is_moved_symbol(symbol: str) -> str | None:
     return None
 
 
-@lru_cache(maxsize=None)
+@cache
 def is_moved_msgid(msgid: str) -> str | None:
     """Return the explanation for moving if the message was moved to extensions."""
     for explanation, moved_messages in MOVED_TO_EXTENSIONS.items():

pylint/message/message_definition_store.py

@@ -5,9 +5,9 @@
 from __future__ import annotations
 
 import collections
-import functools
 import sys
 from collections.abc import Sequence, ValuesView
+from functools import cache
 from typing import TYPE_CHECKING
 
 from pylint.exceptions import UnknownMessageError
@@ -58,9 +58,7 @@ def register_message(self, message: MessageDefinition) -> None:
     # and the arguments are relatively small we do not run the
     # risk of creating a large memory leak.
     # See discussion in: https://github.com/pylint-dev/pylint/pull/5673
-    @functools.lru_cache(  # pylint: disable=method-cache-max-size-none # noqa: B019
-        maxsize=None
-    )
+    @cache  # pylint: disable=method-cache-max-size-none # noqa: B019
     def get_message_definitions(self, msgid_or_symbol: str) -> list[MessageDefinition]:
         """Returns the Message definition for either a numeric or symbolic id.
 

pylint/pyreverse/utils.py

@@ -11,7 +11,7 @@
 import shutil
 import subprocess
 import sys
-from typing import TYPE_CHECKING, Any, Callable, Optional, Tuple, Union
+from typing import TYPE_CHECKING, Any, Callable, Optional, Union
 
 import astroid
 from astroid import nodes
@@ -22,9 +22,9 @@
 
     _CallbackT = Callable[
         [nodes.NodeNG],
-        Union[Tuple[ClassDiagram], Tuple[PackageDiagram, ClassDiagram], None],
+        Union[tuple[ClassDiagram], tuple[PackageDiagram, ClassDiagram], None],
     ]
-    _CallbackTupleT = Tuple[Optional[_CallbackT], Optional[_CallbackT]]
+    _CallbackTupleT = tuple[Optional[_CallbackT], Optional[_CallbackT]]
 
 
 RCFILE = ".pyreverserc"

pylint/reporters/reports_handler_mix_in.py

@@ -6,7 +6,7 @@
 
 import collections
 from collections.abc import MutableSequence
-from typing import TYPE_CHECKING, DefaultDict, List, Tuple
+from typing import TYPE_CHECKING
 
 from pylint.exceptions import EmptyReportError
 from pylint.reporters.ureports.nodes import Section
@@ -17,7 +17,9 @@
     from pylint.checkers import BaseChecker
     from pylint.lint.pylinter import PyLinter
 
-ReportsDict = DefaultDict["BaseChecker", List[Tuple[str, str, ReportsCallable]]]
+ReportsDict = collections.defaultdict[
+    "BaseChecker", list[tuple[str, str, ReportsCallable]]
+]
 
 
 class ReportsHandlerMixIn:

pylint/reporters/text.py

@@ -15,7 +15,7 @@
 import sys
 import warnings
 from dataclasses import asdict, fields
-from typing import TYPE_CHECKING, Dict, NamedTuple, TextIO
+from typing import TYPE_CHECKING, NamedTuple, TextIO
 
 from pylint.message import Message
 from pylint.reporters import BaseReporter
@@ -65,7 +65,7 @@ def _colorize_ansi(self, msg: str) -> str:
         return msg
 
 
-ColorMappingDict = Dict[str, MessageStyle]
+ColorMappingDict = dict[str, MessageStyle]
 
 TITLE_UNDERLINES = ["", "=", "-", "."]
 

pylint/testutils/_primer/primer_command.py

@@ -7,7 +7,7 @@
 import abc
 import argparse
 from pathlib import Path
-from typing import Dict, TypedDict
+from typing import TypedDict
 
 from pylint.reporters.json_reporter import OldJsonExport
 from pylint.testutils._primer import PackageToLint
@@ -18,7 +18,7 @@ class PackageData(TypedDict):
     messages: list[OldJsonExport]
 
 
-PackageMessages = Dict[str, PackageData]
+PackageMessages = dict[str, PackageData]
 
 
 class PrimerCommand:

pylint/testutils/configuration_test.py

@@ -11,14 +11,14 @@
 import logging
 import unittest
 from pathlib import Path
-from typing import Any, Dict
+from typing import Any
 
 from pylint.lint import Run
 
 # We use Any in this typing because the configuration contains real objects and constants
 # that could be a lot of things.
 ConfigurationValue = Any
-PylintConfiguration = Dict[str, ConfigurationValue]
+PylintConfiguration = dict[str, ConfigurationValue]
 
 
 def get_expected_or_default(