Use python-typing-update on half of the tests directory

tests/pyreverse/conftest.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 Callable, Optional
+from __future__ import annotations
+
+from collections.abc import Callable
 
 import pytest
 from astroid.nodes.scoped_nodes import Module
@@ -65,7 +67,7 @@ def html_config() -> PyreverseConfig:
 
 @pytest.fixture(scope="session")
 def get_project() -> Callable:
-    def _get_project(module: str, name: Optional[str] = "No Name") -> Project:
+    def _get_project(module: str, name: str | None = "No Name") -> Project:
         """Return an astroid project representation."""
 
         def _astroid_wrapper(func: Callable, modname: str) -> Module:

tests/pyreverse/test_diadefs.py

@@ -3,10 +3,14 @@
 # Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
 """Unit test for the extensions.diadefslib modules."""
+
 # pylint: disable=redefined-outer-name
+
+from __future__ import annotations
+
 import sys
+from collections.abc import Callable
 from pathlib import Path
-from typing import Callable, Dict, List, Tuple
 
 import pytest
 from astroid import nodes
@@ -22,14 +26,14 @@
 from pylint.testutils.pyreverse import PyreverseConfig
 
 
-def _process_classes(classes: List[DiagramEntity]) -> List[Tuple[bool, str]]:
+def _process_classes(classes: list[DiagramEntity]) -> list[tuple[bool, str]]:
     """Extract class names of a list."""
     return sorted((isinstance(c.node, nodes.ClassDef), c.title) for c in classes)
 
 
 def _process_relations(
-    relations: Dict[str, List[Relationship]]
-) -> List[Tuple[str, str, str]]:
+    relations: dict[str, list[Relationship]]
+) -> list[tuple[str, str, str]]:
     """Extract relation indices from a relation list."""
     result = []
     for rel_type, rels in relations.items():

tests/pyreverse/test_diagrams.py

@@ -3,7 +3,10 @@
 # Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
 """Unit test for the diagrams modules."""
-from typing import Callable
+
+from __future__ import annotations
+
+from collections.abc import Callable
 
 from pylint.pyreverse.diadefslib import DefaultDiadefGenerator, DiadefsHandler
 from pylint.pyreverse.inspector import Linker

tests/pyreverse/test_inspector.py

@@ -3,10 +3,13 @@
 # Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
 """For the visitors.diadefs module."""
+
 # pylint: disable=redefined-outer-name
 
+from __future__ import annotations
+
 import os
-from typing import Callable
+from collections.abc import Callable
 
 import astroid
 import pytest

tests/pyreverse/test_main.py

@@ -3,9 +3,13 @@
 # Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
 """Unittest for the main module."""
+
+from __future__ import annotations
+
 import os
 import sys
-from typing import Any, Iterator
+from collections.abc import Iterator
+from typing import Any
 from unittest import mock
 
 import pytest

tests/pyreverse/test_printer.py

@@ -2,7 +2,7 @@
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
 # Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
-from typing import Type
+from __future__ import annotations
 
 import pytest
 from astroid import nodes
@@ -29,7 +29,7 @@
     ],
 )
 def test_explicit_layout(
-    layout: Layout, printer_class: Type[Printer], expected_content: str, line_index: int
+    layout: Layout, printer_class: type[Printer], expected_content: str, line_index: int
 ) -> None:
     printer = printer_class(title="unittest", layout=layout)
     assert printer.lines[line_index].strip() == expected_content
@@ -39,7 +39,7 @@ def test_explicit_layout(
     "layout, printer_class",
     [(Layout.BOTTOM_TO_TOP, PlantUmlPrinter), (Layout.RIGHT_TO_LEFT, PlantUmlPrinter)],
 )
-def test_unsupported_layout(layout: Layout, printer_class: Type[Printer]):
+def test_unsupported_layout(layout: Layout, printer_class: type[Printer]):
     with pytest.raises(ValueError):
         printer_class(title="unittest", layout=layout)
 

tests/pyreverse/test_writer.py

@@ -4,11 +4,12 @@
 
 """Unit test for ``DiagramWriter``."""
 
+from __future__ import annotations
 
 import codecs
 import os
+from collections.abc import Callable, Iterator
 from difflib import unified_diff
-from typing import Callable, Iterator, List
 from unittest.mock import Mock
 
 import pytest
@@ -53,7 +54,7 @@ def __init__(self):
             setattr(self, attr, value)
 
 
-def _file_lines(path: str) -> List[str]:
+def _file_lines(path: str) -> list[str]:
     # we don't care about the actual encoding, but python3 forces us to pick one
     with codecs.open(path, encoding="latin1") as stream:
         lines = [

tests/test_check_parallel.py

@@ -6,10 +6,11 @@
 
 # pylint: disable=protected-access,missing-function-docstring,no-self-use
 
+from __future__ import annotations
+
 import argparse
 import multiprocessing
 import os
-from typing import List
 
 import dill
 import pytest
@@ -41,7 +42,7 @@ def _gen_file_data(idx: int = 0) -> FileItem:
     return file_data
 
 
-def _gen_file_datas(count: int = 1) -> List[FileItem]:
+def _gen_file_datas(count: int = 1) -> list[FileItem]:
     return [_gen_file_data(idx) for idx in range(count)]
 
 
@@ -62,7 +63,7 @@ class SequentialTestChecker(BaseChecker):
 
     def __init__(self, linter: PyLinter) -> None:
         super().__init__(linter)
-        self.data: List[str] = []
+        self.data: list[str] = []
         self.linter = linter
 
     def process_module(self, _node: nodes.Module) -> None:
@@ -101,7 +102,7 @@ class ParallelTestChecker(BaseChecker, MapReduceMixin):
 
     def __init__(self, linter: PyLinter) -> None:
         super().__init__(linter)
-        self.data: List[str] = []
+        self.data: list[str] = []
         self.linter = linter
 
     def open(self) -> None:
@@ -116,7 +117,7 @@ def close(self) -> None:
     def get_map_data(self):
         return self.data
 
-    def reduce_map_data(self, linter: PyLinter, data: List[List[str]]) -> None:
+    def reduce_map_data(self, linter: PyLinter, data: list[list[str]]) -> None:
         recombined = type(self)(linter)
         recombined.open()
         aggregated = []

tests/test_func.py

@@ -4,17 +4,18 @@
 
 """Functional/non regression tests for pylint."""
 
+from __future__ import annotations
+
 import re
 import sys
-from os.path import abspath, dirname, join
-from typing import List, Optional, Tuple
+from os.path import dirname, join
 
 import pytest
 
 from pylint.testutils import UPDATE_FILE, UPDATE_OPTION, _get_tests_info, linter
 
-INPUT_DIR = join(dirname(abspath(__file__)), "input")
-MSG_DIR = join(dirname(abspath(__file__)), "messages")
+INPUT_DIR = join(dirname(__file__), "input")
+MSG_DIR = join(dirname(__file__), "messages")
 
 
 FILTER_RGX = None
@@ -29,13 +30,13 @@ def exception_str(self, ex) -> str:  # pylint: disable=unused-argument
 
 
 class LintTestUsingModule:
-    INPUT_DIR: Optional[str] = None
+    INPUT_DIR: str | None = None
     DEFAULT_PACKAGE = "input"
     package = DEFAULT_PACKAGE
     linter = linter
-    module: Optional[str] = None
-    depends: Optional[List[Tuple[str, str]]] = None
-    output: Optional[str] = None
+    module: str | None = None
+    depends: list[tuple[str, str]] | None = None
+    output: str | None = None
 
     def _test_functionality(self) -> None:
         if self.module:
@@ -54,7 +55,7 @@ def _check_result(self, got: str) -> None:
         )
         assert self._get_expected() == got, error_msg
 
-    def _test(self, tocheck: List[str]) -> None:
+    def _test(self, tocheck: list[str]) -> None:
         if self.module and INFO_TEST_RGX.match(self.module):
             self.linter.enable("I")
         else:
@@ -137,7 +138,7 @@ def test_functionality(
 
 
 def __test_functionality(
-    module_file: str, messages_file: str, dependencies: List[Tuple[str, str]]
+    module_file: str, messages_file: str, dependencies: list[tuple[str, str]]
 ) -> None:
     lint_test = LintTestUpdate() if UPDATE_FILE.exists() else LintTestUsingModule()
     lint_test.module = module_file.replace(".py", "")

tests/test_functional.py

@@ -3,9 +3,11 @@
 # Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
 
 """Functional full-module tests for PyLint."""
+
+from __future__ import annotations
+
 import sys
 from pathlib import Path
-from typing import Union
 
 import pytest
 from _pytest.config import Config
@@ -46,9 +48,9 @@ def test_functional(
 ) -> None:
     __tracebackhide__ = True  # pylint: disable=unused-variable
     if UPDATE_FILE.exists():
-        lint_test: Union[
-            LintModuleOutputUpdate, testutils.LintModuleTest
-        ] = LintModuleOutputUpdate(test_file, pytestconfig)
+        lint_test: (
+            LintModuleOutputUpdate | testutils.LintModuleTest
+        ) = LintModuleOutputUpdate(test_file, pytestconfig)
     else:
         lint_test = testutils.LintModuleTest(test_file, pytestconfig)
     lint_test.setUp()

tests/test_import_graph.py

@@ -4,10 +4,12 @@
 
 # pylint: disable=redefined-outer-name
 
+from __future__ import annotations
+
 import os
 import shutil
+from collections.abc import Iterator
 from os.path import exists
-from typing import Iterator, Union
 
 import pytest
 from _pytest.fixtures import SubRequest
@@ -18,7 +20,7 @@
 
 
 @pytest.fixture
-def dest(request: SubRequest) -> Iterator[Union[Iterator, Iterator[str]]]:
+def dest(request: SubRequest) -> Iterator[Iterator | Iterator[str]]:
     dest = request.param
     yield dest
     try:

tests/test_pylint_runners.py

@@ -1,11 +1,12 @@
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
 # Copyright (c) https://github.com/PyCQA/pylint/blob/main/CONTRIBUTORS.txt
-
 # pylint: disable=missing-module-docstring, missing-function-docstring
-import os
+
+from __future__ import annotations
+
 import sys
-from typing import Callable
+from collections.abc import Callable
 from unittest.mock import patch
 
 import pytest
@@ -18,7 +19,7 @@
     "runner", [run_epylint, run_pylint, run_pyreverse, run_symilar]
 )
 def test_runner(runner: Callable, tmpdir: LocalPath) -> None:
-    filepath = os.path.abspath(__file__)
+    filepath = __file__
     testargs = ["", filepath]
     with tmpdir.as_cwd():
         with patch.object(sys, "argv", testargs):
@@ -32,7 +33,7 @@ def test_runner(runner: Callable, tmpdir: LocalPath) -> None:
 )
 def test_runner_with_arguments(runner: Callable, tmpdir: LocalPath) -> None:
     """Check the runners with arguments as parameter instead of sys.argv."""
-    filepath = os.path.abspath(__file__)
+    filepath = __file__
     testargs = [filepath]
     with tmpdir.as_cwd():
         with pytest.raises(SystemExit) as err:

tests/test_regr.py

@@ -5,20 +5,24 @@
 """Non regression tests for pylint, which requires a too specific configuration
 to be incorporated in the automatic functional test framework
 """
+
 # pylint: disable=redefined-outer-name
 
+from __future__ import annotations
+
 import os
 import sys
-from os.path import abspath, dirname, join
-from typing import Callable, Iterator, List, cast
+from collections.abc import Callable, Iterator
+from os.path import dirname, join
+from typing import cast
 
 import astroid
 import pytest
 
 from pylint import testutils
 from pylint.lint.pylinter import PyLinter
 
-REGR_DATA = join(dirname(abspath(__file__)), "regrtest_data")
+REGR_DATA = join(dirname(__file__), "regrtest_data")
 sys.path.insert(1, REGR_DATA)
 
 
@@ -63,7 +67,7 @@ def Equals(expected):
     ],
 )
 def test_package(
-    finalize_linter: PyLinter, file_names: List[str], check: Callable
+    finalize_linter: PyLinter, file_names: list[str], check: Callable
 ) -> None:
     finalize_linter.check(file_names)
     finalize_linter.reporter = cast(  # Due to fixture
@@ -81,7 +85,7 @@ def test_package(
         [join(REGR_DATA, "try_finally_disable_msg_crash")],
     ],
 )
-def test_crash(finalize_linter: PyLinter, file_names: List[str]) -> None:
+def test_crash(finalize_linter: PyLinter, file_names: list[str]) -> None:
     finalize_linter.check(file_names)
 
 
@@ -142,5 +146,5 @@ def test_pylint_config_attr() -> None:
 
 @pytest.mark.timeout(30)
 @pytest.mark.parametrize("file_names", ([join(REGR_DATA, "hang", "pkg4972.string")],))
-def test_hang(finalize_linter: PyLinter, file_names: List[str]) -> None:
+def test_hang(finalize_linter: PyLinter, file_names: list[str]) -> None:
     finalize_linter.check(file_names)