diff options
35 files changed, 68 insertions, 45 deletions
diff --git a/pylint/__init__.py b/pylint/__init__.py index 0b3b7e594..68d7f618a 100644 --- a/pylint/__init__.py +++ b/pylint/__init__.py @@ -6,7 +6,7 @@ from __future__ import annotations import os import sys -from typing import Sequence +from collections.abc import Sequence from pylint.__pkginfo__ import __version__ diff --git a/pylint/checkers/base/basic_error_checker.py b/pylint/checkers/base/basic_error_checker.py index a46060af2..3b7fc053c 100644 --- a/pylint/checkers/base/basic_error_checker.py +++ b/pylint/checkers/base/basic_error_checker.py @@ -4,8 +4,11 @@ """Basic Error checker from the basic checker.""" +from __future__ import annotations + import itertools -from typing import Any, Iterator +from collections.abc import Iterator +from typing import Any import astroid from astroid import nodes diff --git a/pylint/checkers/base/name_checker/checker.py b/pylint/checkers/base/name_checker/checker.py index cae50f6d8..1241597bd 100644 --- a/pylint/checkers/base/name_checker/checker.py +++ b/pylint/checkers/base/name_checker/checker.py @@ -11,7 +11,7 @@ import itertools import re import sys from enum import Enum, auto -from typing import Pattern +from re import Pattern import astroid from astroid import nodes diff --git a/pylint/checkers/classes/class_checker.py b/pylint/checkers/classes/class_checker.py index f6116b8e2..bb3f3d169 100644 --- a/pylint/checkers/classes/class_checker.py +++ b/pylint/checkers/classes/class_checker.py @@ -9,7 +9,7 @@ from __future__ import annotations import collections import sys from itertools import chain, zip_longest -from typing import Pattern +from re import Pattern import astroid from astroid import bases, nodes diff --git a/pylint/checkers/deprecated.py b/pylint/checkers/deprecated.py index a0e0c3a42..9a74b0522 100644 --- a/pylint/checkers/deprecated.py +++ b/pylint/checkers/deprecated.py @@ -6,8 +6,9 @@ from __future__ import annotations +from collections.abc import Container, Iterable from itertools import chain -from typing import Any, Container, Iterable +from typing import Any import astroid from astroid import nodes diff --git a/pylint/checkers/design_analysis.py b/pylint/checkers/design_analysis.py index fe3c58cc2..4118e905b 100644 --- a/pylint/checkers/design_analysis.py +++ b/pylint/checkers/design_analysis.py @@ -9,7 +9,8 @@ from __future__ import annotations import re import sys from collections import defaultdict -from typing import TYPE_CHECKING, Iterator, List, cast +from collections.abc import Iterator +from typing import TYPE_CHECKING, List, cast import astroid from astroid import nodes diff --git a/pylint/checkers/refactoring/refactoring_checker.py b/pylint/checkers/refactoring/refactoring_checker.py index 2b177889b..74b1c08a7 100644 --- a/pylint/checkers/refactoring/refactoring_checker.py +++ b/pylint/checkers/refactoring/refactoring_checker.py @@ -9,8 +9,9 @@ import copy import itertools import sys import tokenize +from collections.abc import Iterator from functools import reduce -from typing import Iterator, NamedTuple +from typing import NamedTuple import astroid from astroid import nodes diff --git a/pylint/checkers/similar.py b/pylint/checkers/similar.py index 7fb89b22c..3ebf6b091 100644 --- a/pylint/checkers/similar.py +++ b/pylint/checkers/similar.py @@ -27,6 +27,7 @@ import re import sys import warnings from collections import defaultdict +from collections.abc import Generator, Iterable from getopt import getopt from io import BufferedIOBase, BufferedReader, BytesIO from itertools import chain, groupby @@ -34,8 +35,6 @@ from typing import ( TYPE_CHECKING, Any, Dict, - Generator, - Iterable, List, NamedTuple, NewType, diff --git a/pylint/checkers/spelling.py b/pylint/checkers/spelling.py index 4776f87bf..4eb5e5de0 100644 --- a/pylint/checkers/spelling.py +++ b/pylint/checkers/spelling.py @@ -9,7 +9,8 @@ from __future__ import annotations import os import re import tokenize -from typing import TYPE_CHECKING, Pattern +from re import Pattern +from typing import TYPE_CHECKING from astroid import nodes diff --git a/pylint/checkers/strings.py b/pylint/checkers/strings.py index 34345ffd8..09f1838b1 100644 --- a/pylint/checkers/strings.py +++ b/pylint/checkers/strings.py @@ -10,7 +10,9 @@ import collections import numbers import re import tokenize -from typing import TYPE_CHECKING, Counter, Iterable +from collections import Counter +from collections.abc import Iterable +from typing import TYPE_CHECKING import astroid from astroid import nodes diff --git a/pylint/checkers/typecheck.py b/pylint/checkers/typecheck.py index 867637dae..8eda52e13 100644 --- a/pylint/checkers/typecheck.py +++ b/pylint/checkers/typecheck.py @@ -15,9 +15,10 @@ import shlex import sys import types from collections import deque -from collections.abc import Sequence +from collections.abc import Callable, Iterator, Sequence from functools import singledispatch -from typing import TYPE_CHECKING, Any, Callable, Iterator, Pattern, Union +from re import Pattern +from typing import TYPE_CHECKING, Any, Union import astroid.exceptions from astroid import bases, nodes diff --git a/pylint/checkers/unicode.py b/pylint/checkers/unicode.py index 1f248eb78..cb34f54d7 100644 --- a/pylint/checkers/unicode.py +++ b/pylint/checkers/unicode.py @@ -18,9 +18,10 @@ import contextlib import io import re from collections import OrderedDict +from collections.abc import Iterable from functools import lru_cache from tokenize import detect_encoding -from typing import Iterable, NamedTuple, TypeVar +from typing import NamedTuple, TypeVar from astroid import nodes diff --git a/pylint/checkers/utils.py b/pylint/checkers/utils.py index 96ae533f5..4f415dd34 100644 --- a/pylint/checkers/utils.py +++ b/pylint/checkers/utils.py @@ -12,8 +12,10 @@ import numbers import re import string import warnings +from collections.abc import Callable, Iterable from functools import lru_cache, partial -from typing import Callable, Iterable, Match, TypeVar +from re import Match +from typing import TypeVar import _string import astroid.objects diff --git a/pylint/checkers/variables.py b/pylint/checkers/variables.py index b10130847..7f476d617 100644 --- a/pylint/checkers/variables.py +++ b/pylint/checkers/variables.py @@ -12,9 +12,10 @@ import itertools import os import re import sys +from collections.abc import Iterable, Iterator from enum import Enum from functools import lru_cache -from typing import TYPE_CHECKING, Any, DefaultDict, Iterable, Iterator, NamedTuple +from typing import TYPE_CHECKING, Any, DefaultDict, NamedTuple import astroid from astroid import nodes diff --git a/pylint/config/argument.py b/pylint/config/argument.py index d63cf1062..0bb732b55 100644 --- a/pylint/config/argument.py +++ b/pylint/config/argument.py @@ -13,7 +13,8 @@ import argparse import pathlib import re import sys -from typing import Any, Callable, Pattern, Sequence, Tuple, Union +from collections.abc import Callable +from typing import Any, Pattern, Sequence, Tuple, Union from pylint import interfaces from pylint import utils as pylint_utils diff --git a/pylint/config/arguments_provider.py b/pylint/config/arguments_provider.py index 6bfe22500..58f938466 100644 --- a/pylint/config/arguments_provider.py +++ b/pylint/config/arguments_provider.py @@ -9,7 +9,8 @@ from __future__ import annotations import argparse import optparse # pylint: disable=deprecated-module import warnings -from typing import Any, Iterator +from collections.abc import Iterator +from typing import Any from pylint.config.arguments_manager import _ArgumentsManager from pylint.typing import OptionDict, Options diff --git a/pylint/config/callback_actions.py b/pylint/config/callback_actions.py index f8409e4ff..dbbe1f866 100644 --- a/pylint/config/callback_actions.py +++ b/pylint/config/callback_actions.py @@ -12,8 +12,9 @@ import abc import argparse import sys import warnings +from collections.abc import Sequence from pathlib import Path -from typing import TYPE_CHECKING, Any, Sequence +from typing import TYPE_CHECKING, Any from pylint import exceptions, extensions, interfaces, utils diff --git a/pylint/config/deprecation_actions.py b/pylint/config/deprecation_actions.py index 2847436a9..c7c3e9b17 100644 --- a/pylint/config/deprecation_actions.py +++ b/pylint/config/deprecation_actions.py @@ -10,7 +10,8 @@ from __future__ import annotations import argparse import warnings -from typing import Any, Sequence +from collections.abc import Sequence +from typing import Any class _OldNamesAction(argparse._StoreAction): diff --git a/pylint/config/find_default_config_files.py b/pylint/config/find_default_config_files.py index 34db721ff..9729892cb 100644 --- a/pylint/config/find_default_config_files.py +++ b/pylint/config/find_default_config_files.py @@ -8,8 +8,8 @@ import configparser import os import sys import warnings +from collections.abc import Iterator from pathlib import Path -from typing import Iterator if sys.version_info >= (3, 11): import tomllib diff --git a/pylint/config/option.py b/pylint/config/option.py index 2c4b52fc5..e317b4ac9 100644 --- a/pylint/config/option.py +++ b/pylint/config/option.py @@ -8,7 +8,7 @@ import copy import optparse # pylint: disable=deprecated-module import pathlib import re -from typing import Pattern +from re import Pattern from pylint import utils diff --git a/pylint/config/utils.py b/pylint/config/utils.py index 75b62938e..69d3b10c9 100644 --- a/pylint/config/utils.py +++ b/pylint/config/utils.py @@ -8,8 +8,9 @@ from __future__ import annotations import re import warnings +from collections.abc import Callable from pathlib import Path -from typing import TYPE_CHECKING, Any, Callable +from typing import TYPE_CHECKING, Any from pylint import extensions, utils from pylint.config.argument import ( diff --git a/pylint/epylint.py b/pylint/epylint.py index 16fd22356..567d8f222 100755 --- a/pylint/epylint.py +++ b/pylint/epylint.py @@ -42,9 +42,9 @@ from __future__ import annotations import os import shlex import sys +from collections.abc import Sequence from io import StringIO from subprocess import PIPE, Popen -from typing import Sequence def _get_env(): diff --git a/pylint/extensions/comparetozero.py b/pylint/extensions/comparetozero.py index 1786b3d2c..4f73f2554 100644 --- a/pylint/extensions/comparetozero.py +++ b/pylint/extensions/comparetozero.py @@ -7,7 +7,8 @@ from __future__ import annotations import itertools -from typing import TYPE_CHECKING, Any, Iterable +from collections.abc import Iterable +from typing import TYPE_CHECKING, Any import astroid from astroid import nodes diff --git a/pylint/extensions/emptystring.py b/pylint/extensions/emptystring.py index 7056d1d69..795689703 100644 --- a/pylint/extensions/emptystring.py +++ b/pylint/extensions/emptystring.py @@ -7,7 +7,8 @@ from __future__ import annotations import itertools -from typing import TYPE_CHECKING, Any, Iterable +from collections.abc import Iterable +from typing import TYPE_CHECKING, Any from astroid import nodes diff --git a/pylint/lint/expand_modules.py b/pylint/lint/expand_modules.py index cd693a71c..774606f55 100644 --- a/pylint/lint/expand_modules.py +++ b/pylint/lint/expand_modules.py @@ -6,7 +6,7 @@ from __future__ import annotations import os import sys -from typing import Pattern +from re import Pattern from astroid import modutils diff --git a/pylint/lint/parallel.py b/pylint/lint/parallel.py index faa7ad4c3..d6b8621e2 100644 --- a/pylint/lint/parallel.py +++ b/pylint/lint/parallel.py @@ -7,7 +7,8 @@ from __future__ import annotations import collections import functools import warnings -from typing import TYPE_CHECKING, Any, DefaultDict, Iterable, Sequence +from collections.abc import Iterable, Sequence +from typing import TYPE_CHECKING, Any, DefaultDict import dill diff --git a/pylint/lint/pylinter.py b/pylint/lint/pylinter.py index 6ba685cef..8647f6ff2 100644 --- a/pylint/lint/pylinter.py +++ b/pylint/lint/pylinter.py @@ -13,8 +13,9 @@ import sys import tokenize import traceback import warnings +from collections.abc import Iterable, Iterator, Sequence from io import TextIOWrapper -from typing import Any, DefaultDict, Iterable, Iterator, Sequence +from typing import Any, DefaultDict import astroid from astroid import AstroidError, nodes diff --git a/pylint/message/message_definition_store.py b/pylint/message/message_definition_store.py index b7d0415ad..b3f502f00 100644 --- a/pylint/message/message_definition_store.py +++ b/pylint/message/message_definition_store.py @@ -6,7 +6,8 @@ from __future__ import annotations import collections import functools -from typing import TYPE_CHECKING, ValuesView +from collections.abc import ValuesView +from typing import TYPE_CHECKING from pylint.exceptions import UnknownMessageError from pylint.message.message_definition import MessageDefinition diff --git a/pylint/pyreverse/main.py b/pylint/pyreverse/main.py index a89cb2019..fcb82bc25 100644 --- a/pylint/pyreverse/main.py +++ b/pylint/pyreverse/main.py @@ -6,8 +6,11 @@ create UML diagrams for classes and modules in <packages> """ + +from __future__ import annotations + import sys -from typing import Iterable +from collections.abc import Iterable from pylint.config import ConfigurationMixIn from pylint.lint.utils import fix_import_path diff --git a/pylint/pyreverse/vcg_printer.py b/pylint/pyreverse/vcg_printer.py index 4ca5c254f..288be3dd0 100644 --- a/pylint/pyreverse/vcg_printer.py +++ b/pylint/pyreverse/vcg_printer.py @@ -13,7 +13,8 @@ maybe used for the functions parameters. from __future__ import annotations -from typing import Any, Mapping +from collections.abc import Mapping +from typing import Any from pylint.pyreverse.printer import EdgeType, Layout, NodeProperties, NodeType, Printer diff --git a/pylint/reporters/multi_reporter.py b/pylint/reporters/multi_reporter.py index 6a2f0b5e3..bc4d00eb8 100644 --- a/pylint/reporters/multi_reporter.py +++ b/pylint/reporters/multi_reporter.py @@ -5,7 +5,8 @@ from __future__ import annotations import os -from typing import TYPE_CHECKING, Callable, TextIO +from collections.abc import Callable +from typing import TYPE_CHECKING, TextIO from pylint.interfaces import IReporter from pylint.message import Message diff --git a/pylint/reporters/reports_handler_mix_in.py b/pylint/reporters/reports_handler_mix_in.py index 959fffcc9..f6abdc092 100644 --- a/pylint/reporters/reports_handler_mix_in.py +++ b/pylint/reporters/reports_handler_mix_in.py @@ -5,15 +5,8 @@ from __future__ import annotations import collections -from typing import ( - TYPE_CHECKING, - Callable, - DefaultDict, - List, - MutableSequence, - Optional, - Tuple, -) +from collections.abc import MutableSequence +from typing import TYPE_CHECKING, Callable, DefaultDict, List, Optional, Tuple from pylint.exceptions import EmptyReportError from pylint.reporters.ureports.nodes import Section diff --git a/pylint/reporters/ureports/base_writer.py b/pylint/reporters/ureports/base_writer.py index 67a442b11..a22a789b6 100644 --- a/pylint/reporters/ureports/base_writer.py +++ b/pylint/reporters/ureports/base_writer.py @@ -11,8 +11,9 @@ formatted as text and html. from __future__ import annotations import sys +from collections.abc import Iterator from io import StringIO -from typing import TYPE_CHECKING, Iterator, TextIO +from typing import TYPE_CHECKING, TextIO if TYPE_CHECKING: from pylint.reporters.ureports.nodes import ( diff --git a/pylint/reporters/ureports/nodes.py b/pylint/reporters/ureports/nodes.py index 50af3943c..2d96b4114 100644 --- a/pylint/reporters/ureports/nodes.py +++ b/pylint/reporters/ureports/nodes.py @@ -9,7 +9,8 @@ A micro report is a tree of layout and content objects. from __future__ import annotations -from typing import Any, Callable, Iterable, Iterator, TypeVar +from collections.abc import Iterable, Iterator +from typing import Any, Callable, TypeVar from pylint.reporters.ureports.base_writer import BaseWriter diff --git a/pylint/testutils/checker_test_case.py b/pylint/testutils/checker_test_case.py index a8dbaca83..e6649df73 100644 --- a/pylint/testutils/checker_test_case.py +++ b/pylint/testutils/checker_test_case.py @@ -6,7 +6,7 @@ from __future__ import annotations import contextlib import warnings -from typing import Generator +from collections.abc import Generator from pylint.checkers.base_checker import BaseChecker from pylint.constants import PY38_PLUS |