Import Match and Pattern from re, not typing (#8277)

stubs/Flask-Cors/flask_cors/core.pyi

@@ -1,7 +1,8 @@
 from collections.abc import Iterable
 from datetime import timedelta
 from logging import Logger
-from typing import Any, Pattern, TypeVar, overload
+from re import Pattern
+from typing import Any, TypeVar, overload
 from typing_extensions import TypeAlias, TypedDict
 
 _IterableT = TypeVar("_IterableT", bound=Iterable[Any])

stubs/Flask-Cors/flask_cors/decorator.pyi

@@ -1,7 +1,8 @@
 from collections.abc import Callable, Iterable
 from datetime import timedelta
 from logging import Logger
-from typing import Any, Pattern
+from re import Pattern
+from typing import Any
 from typing_extensions import ParamSpec
 
 _P = ParamSpec("_P")

stubs/Flask-SQLAlchemy/flask_sqlalchemy/model.pyi

@@ -1,4 +1,5 @@
-from typing import Any, Pattern
+from re import Pattern
+from typing import Any
 
 from sqlalchemy.ext.declarative import DeclarativeMeta
 

stubs/Markdown/markdown/blockprocessors.pyi

@@ -1,5 +1,6 @@
 from logging import Logger
-from typing import Any, Match, Pattern
+from re import Match, Pattern
+from typing import Any
 from xml.etree.ElementTree import Element
 
 from markdown import Markdown

stubs/Markdown/markdown/extensions/abbr.pyi

@@ -1,4 +1,5 @@
-from typing import Any, Pattern
+from re import Pattern
+from typing import Any
 
 from markdown.blockprocessors import BlockProcessor
 from markdown.extensions import Extension

stubs/Markdown/markdown/extensions/admonition.pyi

@@ -1,4 +1,5 @@
-from typing import Any, Pattern
+from re import Pattern
+from typing import Any
 
 from markdown.blockprocessors import BlockProcessor
 from markdown.extensions import Extension

stubs/Markdown/markdown/extensions/attr_list.pyi

@@ -1,4 +1,4 @@
-from typing import Pattern
+from re import Pattern
 
 from markdown.extensions import Extension
 from markdown.treeprocessors import Treeprocessor

stubs/Markdown/markdown/extensions/def_list.pyi

@@ -1,4 +1,4 @@
-from typing import Pattern
+from re import Pattern
 
 from markdown.blockprocessors import BlockProcessor, ListIndentProcessor
 from markdown.extensions import Extension

stubs/Markdown/markdown/extensions/fenced_code.pyi

@@ -1,4 +1,5 @@
-from typing import Any, Pattern
+from re import Pattern
+from typing import Any
 
 from markdown.extensions import Extension
 from markdown.preprocessors import Preprocessor

stubs/Markdown/markdown/extensions/footnotes.pyi

@@ -1,4 +1,5 @@
-from typing import Any, Pattern
+from re import Pattern
+from typing import Any
 
 from markdown.extensions import Extension
 from markdown.inlinepatterns import InlineProcessor

stubs/Markdown/markdown/extensions/legacy_attrs.pyi

@@ -1,4 +1,4 @@
-from typing import Pattern
+from re import Pattern
 
 from markdown.extensions import Extension
 from markdown.treeprocessors import Treeprocessor

stubs/Markdown/markdown/extensions/meta.pyi

@@ -1,4 +1,5 @@
-from typing import Any, Pattern
+from re import Pattern
+from typing import Any
 
 from markdown.extensions import Extension
 from markdown.preprocessors import Preprocessor

stubs/Markdown/markdown/extensions/toc.pyi

@@ -1,4 +1,5 @@
-from typing import Any, Pattern
+from re import Pattern
+from typing import Any
 
 from markdown.extensions import Extension
 from markdown.treeprocessors import Treeprocessor

stubs/Markdown/markdown/inlinepatterns.pyi

@@ -1,5 +1,6 @@
-import typing
-from typing import Any, ClassVar, Match
+import re
+from re import Match
+from typing import Any, ClassVar
 from xml.etree.ElementTree import Element
 
 def build_inlinepatterns(md, **kwargs): ...
@@ -94,7 +95,7 @@ class LinkInlineProcessor(InlineProcessor):
 class ImageInlineProcessor(LinkInlineProcessor): ...
 
 class ReferenceInlineProcessor(LinkInlineProcessor):
-    NEWLINE_CLEANUP_RE: ClassVar[typing.Pattern[str]]
+    NEWLINE_CLEANUP_RE: ClassVar[re.Pattern[str]]
     def evalId(self, data, index, text): ...
     def makeTag(self, href, title, text): ...
 

stubs/Markdown/markdown/postprocessors.pyi

@@ -1,4 +1,5 @@
-from typing import Any, Pattern
+from re import Pattern
+from typing import Any
 
 from . import util
 

stubs/Markdown/markdown/preprocessors.pyi

@@ -1,4 +1,5 @@
-from typing import Any, Pattern
+from re import Pattern
+from typing import Any
 
 from . import util
 

stubs/Markdown/markdown/util.pyi

@@ -1,4 +1,5 @@
-from typing import Any, Pattern, overload
+from re import Pattern
+from typing import Any, overload
 
 PY37: bool
 __deprecated__: dict[str, tuple[str, Any]]

stubs/PyYAML/yaml/__init__.pyi

@@ -1,5 +1,6 @@
 from collections.abc import Callable, Iterable, Iterator, Mapping, Sequence
-from typing import Any, Pattern, TypeVar, overload
+from re import Pattern
+from typing import Any, TypeVar, overload
 from typing_extensions import TypeAlias
 
 from . import resolver as resolver  # Help mypy a bit; this is implied by loader and dumper

stubs/PyYAML/yaml/constructor.pyi

@@ -1,5 +1,6 @@
 from collections.abc import Callable
-from typing import Any, Pattern, TypeVar
+from re import Pattern
+from typing import Any, TypeVar
 from typing_extensions import TypeAlias
 
 from yaml.error import MarkedYAMLError

stubs/beautifulsoup4/bs4/element.pyi

@@ -1,6 +1,7 @@
 from _typeshed import Self
 from collections.abc import Callable, Iterable, Iterator
-from typing import Any, Generic, Pattern, TypeVar, overload
+from re import Pattern
+from typing import Any, Generic, TypeVar, overload
 from typing_extensions import TypeAlias
 
 from . import BeautifulSoup

stubs/bleach/bleach/linkifier.pyi

@@ -1,5 +1,6 @@
 from collections.abc import Container, Iterable, MutableMapping
-from typing import Any, Pattern, Protocol
+from re import Pattern
+from typing import Any, Protocol
 from typing_extensions import TypeAlias
 
 from .html5lib_shim import Filter

stubs/bleach/bleach/sanitizer.pyi

@@ -1,5 +1,6 @@
 from collections.abc import Callable, Container, Iterable
-from typing import Any, Pattern
+from re import Pattern
+from typing import Any
 from typing_extensions import TypeAlias
 
 from .css_sanitizer import CSSSanitizer

stubs/chardet/chardet/universaldetector.pyi

@@ -1,5 +1,5 @@
 from logging import Logger
-from typing import Pattern
+from re import Pattern
 from typing_extensions import TypedDict
 
 class _FinalResultType(TypedDict):

stubs/colorama/colorama/ansitowin32.pyi

@@ -1,8 +1,9 @@
 import sys
 from _typeshed import SupportsWrite
 from collections.abc import Callable, Sequence
+from re import Pattern
 from types import TracebackType
-from typing import Any, Pattern, TextIO
+from typing import Any, TextIO
 from typing_extensions import TypeAlias
 
 if sys.platform == "win32":

stubs/dateparser/dateparser/date.pyi

@@ -1,7 +1,8 @@
 import collections
 from collections.abc import Callable, Iterable, Iterator
 from datetime import datetime
-from typing import ClassVar, Pattern, overload
+from re import Pattern
+from typing import ClassVar, overload
 from typing_extensions import Literal, TypeAlias
 
 from dateparser import _Settings

stubs/dateparser/dateparser/languages/locale.pyi

@@ -1,12 +1,7 @@
-import sys
+from re import Pattern
 
 from dateparser.conf import Settings
 
-if sys.version_info >= (3, 8):
-    from re import Pattern
-else:
-    from typing import Pattern
-
 DIGIT_GROUP_PATTERN: Pattern[str]
 NUMERAL_PATTERN: Pattern[str]
 

stubs/decorator/decorator.pyi

@@ -2,7 +2,8 @@ from builtins import dict as _dict  # alias to avoid conflicts with attribute na
 from collections.abc import Callable, Iterator
 from contextlib import _GeneratorContextManager
 from inspect import getfullargspec as getfullargspec, iscoroutinefunction as iscoroutinefunction
-from typing import Any, Pattern, TypeVar
+from re import Pattern
+from typing import Any, TypeVar
 from typing_extensions import ParamSpec
 
 _C = TypeVar("_C", bound=Callable[..., Any])

stubs/emoji/emoji/core.pyi

@@ -1,5 +1,5 @@
 from collections.abc import Callable
-from typing import Pattern
+from re import Pattern
 from typing_extensions import Literal, TypedDict
 
 _DEFAULT_DELIMITER: str

stubs/entrypoints/entrypoints.pyi

@@ -7,7 +7,7 @@ from typing import Any
 if sys.version_info >= (3, 8):
     from re import Pattern
 else:
-    from typing import Pattern
+    from re import Pattern
 
 entry_point_pattern: Pattern[str]
 file_in_zip_pattern: Pattern[str]

stubs/humanfriendly/humanfriendly/__init__.pyi

@@ -1,6 +1,7 @@
 import datetime
+from re import Pattern
 from types import TracebackType
-from typing import Any, NamedTuple, Pattern
+from typing import Any, NamedTuple
 
 class SizeUnit(NamedTuple):
     divider: int

stubs/paramiko/paramiko/config.pyi

@@ -1,6 +1,7 @@
 from _typeshed import Self
 from collections.abc import Iterable
-from typing import IO, Any, Pattern
+from re import Pattern
+from typing import IO, Any
 
 from paramiko.ssh_exception import ConfigParseError as ConfigParseError, CouldNotCanonicalize as CouldNotCanonicalize
 

stubs/paramiko/paramiko/pkey.pyi

@@ -1,5 +1,6 @@
 from _typeshed import Self
-from typing import IO, Pattern
+from re import Pattern
+from typing import IO
 
 from paramiko.message import Message
 

stubs/parsimonious/parsimonious/expressions.pyi

@@ -1,6 +1,7 @@
 import collections.abc
 from collections.abc import Callable, Mapping
-from typing import Any, Pattern, Union
+from re import Pattern
+from typing import Any, Union
 from typing_extensions import TypeAlias
 
 from parsimonious.exceptions import ParseError

stubs/parsimonious/parsimonious/nodes.pyi

@@ -1,5 +1,6 @@
 from collections.abc import Callable, Iterator, Sequence
-from typing import Any, Match, NoReturn, TypeVar
+from re import Match
+from typing import Any, NoReturn, TypeVar
 
 from parsimonious.exceptions import VisitationError as VisitationError
 from parsimonious.expressions import Expression

stubs/passpy/passpy/store.pyi

@@ -1,6 +1,6 @@
 from _typeshed import StrPath
 from collections.abc import Iterator
-from typing import Match
+from re import Match
 
 class Store:
     def __init__(

stubs/pyflakes/pyflakes/api.pyi

@@ -1,5 +1,6 @@
 from collections.abc import Iterable, Iterator, Sequence
-from typing import Any, Pattern
+from re import Pattern
+from typing import Any
 
 from pyflakes.reporter import Reporter
 

stubs/pyflakes/pyflakes/checker.pyi

@@ -1,8 +1,9 @@
 import ast
 import sys
 from collections.abc import Callable, Iterable, Iterator
+from re import Pattern
 from tokenize import TokenInfo
-from typing import Any, ClassVar, Pattern, TypeVar, overload
+from typing import Any, ClassVar, TypeVar, overload
 from typing_extensions import Literal, ParamSpec, TypeAlias
 
 from pyflakes.messages import Message

stubs/redis/redis/client.pyi

@@ -2,8 +2,9 @@ import threading
 from _typeshed import Incomplete, Self, SupportsItems
 from collections.abc import Callable, Iterable, Iterator, Mapping, Sequence
 from datetime import datetime, timedelta
+from re import Pattern
 from types import TracebackType
-from typing import Any, ClassVar, Generic, Pattern, TypeVar, overload
+from typing import Any, ClassVar, Generic, TypeVar, overload
 from typing_extensions import Literal, TypeAlias
 
 from redis import RedisError

stubs/simplejson/simplejson/decoder.pyi

@@ -1,4 +1,5 @@
-from typing import Any, Match
+from re import Match
+from typing import Any
 
 class JSONDecoder:
     def __init__(self, **kwargs: Any) -> None: ...

stubs/six/six/__init__.pyi

@@ -9,7 +9,8 @@ from collections.abc import Callable, ItemsView, Iterable, Iterator as _Iterator
 from functools import wraps as wraps
 from importlib.util import spec_from_loader as spec_from_loader
 from io import BytesIO as BytesIO, StringIO as StringIO
-from typing import Any, AnyStr, NoReturn, Pattern, TypeVar, overload
+from re import Pattern
+from typing import Any, AnyStr, NoReturn, TypeVar, overload
 from typing_extensions import Literal
 
 from . import moves as moves

stubs/toml/toml/decoder.pyi

@@ -1,7 +1,8 @@
 from _typeshed import SupportsRead
 from collections.abc import Callable, MutableMapping
 from pathlib import PurePath
-from typing import Any, Generic, Pattern, TypeVar, overload
+from re import Pattern
+from typing import Any, Generic, TypeVar, overload
 from typing_extensions import TypeAlias
 
 _MutableMappingT = TypeVar("_MutableMappingT", bound=MutableMapping[str, Any])

stubs/tqdm/tqdm/utils.pyi

@@ -1,6 +1,7 @@
 from _typeshed import Incomplete
 from collections.abc import Callable
-from typing import Pattern, Protocol, TypeVar
+from re import Pattern
+from typing import Protocol, TypeVar
 from typing_extensions import ParamSpec
 
 CUR_OS: str

stubs/waitress/waitress/parser.pyi

@@ -1,6 +1,7 @@
 from collections.abc import Mapping, Sequence
 from io import BytesIO
-from typing import Any, Pattern
+from re import Pattern
+from typing import Any
 
 from waitress.adjustments import Adjustments
 from waitress.receiver import ChunkedReceiver, FixedStreamReceiver

stubs/waitress/waitress/runner.pyi

@@ -1,6 +1,7 @@
 from collections.abc import Callable, Sequence
 from io import TextIOWrapper
-from typing import Any, Pattern
+from re import Pattern
+from typing import Any
 
 HELP: str
 RUNNER_PATTERN: Pattern[Any]

stubs/waitress/waitress/utilities.pyi

@@ -1,7 +1,8 @@
 from _typeshed.wsgi import StartResponse
 from collections.abc import Iterator, Mapping, Sequence
 from logging import Logger
-from typing import Any, Match, Pattern
+from re import Match, Pattern
+from typing import Any
 
 logger: Logger
 queue_logger: Logger

stubs/whatthepatch/whatthepatch/patch.pyi

@@ -1,5 +1,6 @@
 from collections.abc import Iterable, Iterator
-from typing import NamedTuple, Pattern
+from re import Pattern
+from typing import NamedTuple
 
 from . import exceptions as exceptions
 from .snippets import findall_regex as findall_regex, split_by_regex as split_by_regex

stubs/whatthepatch/whatthepatch/snippets.pyi

@@ -1,5 +1,5 @@
 from collections.abc import Sequence
-from typing import Pattern
+from re import Pattern
 
 def remove(path: str) -> None: ...
 def findall_regex(items: Sequence[str], regex: Pattern[str]) -> list[int]: ...

stubs/zxcvbn/zxcvbn/matching.pyi

@@ -1,6 +1,7 @@
 from collections.abc import Iterable, Mapping
 from decimal import Decimal
-from typing import Any, Pattern
+from re import Pattern
+from typing import Any
 from typing_extensions import Literal, NotRequired, TypedDict
 
 from .adjacency_graphs import _Graph

stubs/zxcvbn/zxcvbn/scoring.pyi

@@ -1,6 +1,6 @@
 from collections.abc import Iterable
 from decimal import Decimal
-from typing import Pattern
+from re import Pattern
 from typing_extensions import TypedDict
 
 from .adjacency_graphs import _Graph