diff options
Diffstat (limited to 'pylint/testutils')
-rw-r--r-- | pylint/testutils/_primer/package_to_lint.py | 7 | ||||
-rw-r--r-- | pylint/testutils/_primer/primer_command.py | 8 | ||||
-rw-r--r-- | pylint/testutils/functional/test_file.py | 8 | ||||
-rw-r--r-- | pylint/testutils/pyreverse.py | 8 | ||||
-rw-r--r-- | pylint/testutils/unittest_linter.py | 8 |
5 files changed, 5 insertions, 34 deletions
diff --git a/pylint/testutils/_primer/package_to_lint.py b/pylint/testutils/_primer/package_to_lint.py index 11df63bd2..1f596f02b 100644 --- a/pylint/testutils/_primer/package_to_lint.py +++ b/pylint/testutils/_primer/package_to_lint.py @@ -5,18 +5,13 @@ from __future__ import annotations import logging -import sys from pathlib import Path +from typing import Literal from git import GitCommandError from git.cmd import Git from git.repo import Repo -if sys.version_info >= (3, 8): - from typing import Literal -else: - from typing_extensions import Literal - PRIMER_DIRECTORY_PATH = Path("tests") / ".pylint_primer_tests" diff --git a/pylint/testutils/_primer/primer_command.py b/pylint/testutils/_primer/primer_command.py index 08adedd4c..817c1a0d3 100644 --- a/pylint/testutils/_primer/primer_command.py +++ b/pylint/testutils/_primer/primer_command.py @@ -6,18 +6,12 @@ from __future__ import annotations import abc import argparse -import sys from pathlib import Path -from typing import Dict +from typing import Dict, TypedDict from pylint.reporters.json_reporter import OldJsonExport from pylint.testutils._primer import PackageToLint -if sys.version_info >= (3, 8): - from typing import TypedDict -else: - from typing_extensions import TypedDict - class PackageData(TypedDict): commit: str diff --git a/pylint/testutils/functional/test_file.py b/pylint/testutils/functional/test_file.py index 5b2e4efb6..16593b5c4 100644 --- a/pylint/testutils/functional/test_file.py +++ b/pylint/testutils/functional/test_file.py @@ -5,9 +5,9 @@ from __future__ import annotations import configparser -import sys from collections.abc import Callable from os.path import basename, exists, join +from typing import TypedDict def parse_python_version(ver_str: str) -> tuple[int, ...]: @@ -19,12 +19,6 @@ class NoFileError(Exception): pass -if sys.version_info >= (3, 8): - from typing import TypedDict -else: - from typing_extensions import TypedDict - - class TestFileOptions(TypedDict): min_pyver: tuple[int, ...] max_pyver: tuple[int, ...] diff --git a/pylint/testutils/pyreverse.py b/pylint/testutils/pyreverse.py index 24fddad77..c621f9e7a 100644 --- a/pylint/testutils/pyreverse.py +++ b/pylint/testutils/pyreverse.py @@ -7,17 +7,11 @@ from __future__ import annotations import argparse import configparser import shlex -import sys from pathlib import Path -from typing import NamedTuple +from typing import NamedTuple, TypedDict from pylint.pyreverse.main import DEFAULT_COLOR_PALETTE -if sys.version_info >= (3, 8): - from typing import TypedDict -else: - from typing_extensions import TypedDict - # This class could and should be replaced with a simple dataclass when support for Python < 3.7 is dropped. # A NamedTuple is not possible as some tests need to modify attributes during the test. diff --git a/pylint/testutils/unittest_linter.py b/pylint/testutils/unittest_linter.py index 84fc53bc8..a19afec56 100644 --- a/pylint/testutils/unittest_linter.py +++ b/pylint/testutils/unittest_linter.py @@ -6,8 +6,7 @@ from __future__ import annotations -import sys -from typing import Any +from typing import Any, Literal from astroid import nodes @@ -15,11 +14,6 @@ from pylint.interfaces import UNDEFINED, Confidence from pylint.lint import PyLinter from pylint.testutils.output_line import MessageTest -if sys.version_info >= (3, 8): - from typing import Literal -else: - from typing_extensions import Literal - class UnittestLinter(PyLinter): """A fake linter class to capture checker messages.""" |