Use --py39-plus and --full-reorder in python-typing-update

pylint/__init__.py

@@ -6,7 +6,7 @@
 
 import os
 import sys
-from typing import Sequence
+from collections.abc import Sequence
 
 from pylint.__pkginfo__ import __version__
 

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

pylint/checkers/base/name_checker/checker.py

@@ -11,7 +11,7 @@
 import re
 import sys
 from enum import Enum, auto
-from typing import Pattern
+from re import Pattern
 
 import astroid
 from astroid import nodes

pylint/checkers/classes/class_checker.py

@@ -9,7 +9,7 @@
 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

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

pylint/checkers/design_analysis.py

@@ -9,7 +9,8 @@
 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

pylint/checkers/refactoring/refactoring_checker.py

@@ -9,8 +9,9 @@
 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

pylint/checkers/similar.py

@@ -27,15 +27,14 @@
 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
 from typing import (
     TYPE_CHECKING,
     Any,
     Dict,
-    Generator,
-    Iterable,
     List,
     NamedTuple,
     NewType,

pylint/checkers/spelling.py

@@ -9,7 +9,8 @@
 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
 

pylint/checkers/strings.py

@@ -10,7 +10,9 @@
 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

pylint/checkers/typecheck.py

@@ -15,9 +15,10 @@
 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

pylint/checkers/unicode.py

@@ -18,9 +18,10 @@
 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
 

pylint/checkers/utils.py

@@ -12,8 +12,10 @@
 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

pylint/checkers/variables.py

@@ -12,9 +12,10 @@
 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

pylint/config/argument.py

@@ -13,7 +13,8 @@
 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

pylint/config/arguments_provider.py

@@ -8,7 +8,8 @@
 
 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

pylint/config/callback_actions.py

@@ -12,8 +12,9 @@
 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
 

pylint/config/deprecation_actions.py

@@ -10,7 +10,8 @@
 
 import argparse
 import warnings
-from typing import Any, Sequence
+from collections.abc import Sequence
+from typing import Any
 
 
 class _OldNamesAction(argparse._StoreAction):

pylint/config/find_default_config_files.py

@@ -8,8 +8,8 @@
 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

pylint/config/option.py

@@ -8,7 +8,7 @@
 import optparse  # pylint: disable=deprecated-module
 import pathlib
 import re
-from typing import Pattern
+from re import Pattern
 
 from pylint import utils
 

pylint/config/utils.py

@@ -8,8 +8,9 @@
 
 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 (

pylint/epylint.py

@@ -42,9 +42,9 @@
 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():

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

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
 

pylint/lint/expand_modules.py

@@ -6,7 +6,7 @@
 
 import os
 import sys
-from typing import Pattern
+from re import Pattern
 
 from astroid import modutils
 

pylint/lint/parallel.py

@@ -7,7 +7,8 @@
 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
 

pylint/lint/pylinter.py

@@ -13,8 +13,9 @@
 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

pylint/message/message_definition_store.py

@@ -6,7 +6,8 @@
 
 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

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

pylint/pyreverse/vcg_printer.py

@@ -13,7 +13,8 @@
 
 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
 

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

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

pylint/reporters/ureports/base_writer.py

@@ -11,8 +11,9 @@
 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 (

pylint/reporters/ureports/nodes.py

@@ -9,7 +9,8 @@
 
 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
 

pylint/testutils/checker_test_case.py

@@ -6,7 +6,7 @@
 
 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