From 6348a58b8b950f894c9bd92f5ee55eeb521a0cbf Mon Sep 17 00:00:00 2001 From: Alex Waygood Date: Tue, 12 Jul 2022 14:32:48 +0100 Subject: [PATCH] Import `Match` and `Pattern` from `re`, not `typing` (#8277) --- stdlib/argparse.pyi | 3 ++- stdlib/configparser.pyi | 3 ++- stdlib/distutils/command/config.pyi | 3 ++- stdlib/distutils/filelist.pyi | 3 ++- stdlib/distutils/version.pyi | 2 +- stdlib/email/_header_value_parser.pyi | 3 ++- stdlib/html/parser.pyi | 2 +- stdlib/http/cookiejar.pyi | 3 ++- stdlib/imaplib.pyi | 3 ++- stdlib/importlib/metadata/__init__.pyi | 3 ++- stdlib/json/encoder.pyi | 3 ++- stdlib/lib2to3/pgen2/literals.pyi | 2 +- stdlib/logging/__init__.pyi | 3 ++- stdlib/logging/config.pyi | 3 ++- stdlib/logging/handlers.pyi | 3 ++- stdlib/poplib.pyi | 3 ++- stdlib/smtplib.pyi | 3 ++- stdlib/sre_compile.pyi | 3 ++- stdlib/sre_parse.pyi | 3 ++- stdlib/string.pyi | 7 +------ stdlib/telnetlib.pyi | 3 ++- stdlib/textwrap.pyi | 2 +- stdlib/tokenize.pyi | 3 ++- stdlib/unittest/case.pyi | 2 +- stdlib/unittest/loader.pyi | 3 ++- stdlib/urllib/request.pyi | 3 ++- stdlib/wsgiref/headers.pyi | 3 ++- stdlib/xml/etree/ElementPath.pyi | 3 ++- stdlib/xmlrpc/server.pyi | 3 ++- stubs/Flask-Cors/flask_cors/core.pyi | 3 ++- stubs/Flask-Cors/flask_cors/decorator.pyi | 3 ++- stubs/Flask-SQLAlchemy/flask_sqlalchemy/model.pyi | 3 ++- stubs/Markdown/markdown/blockprocessors.pyi | 3 ++- stubs/Markdown/markdown/extensions/abbr.pyi | 3 ++- stubs/Markdown/markdown/extensions/admonition.pyi | 3 ++- stubs/Markdown/markdown/extensions/attr_list.pyi | 2 +- stubs/Markdown/markdown/extensions/def_list.pyi | 2 +- stubs/Markdown/markdown/extensions/fenced_code.pyi | 3 ++- stubs/Markdown/markdown/extensions/footnotes.pyi | 3 ++- stubs/Markdown/markdown/extensions/legacy_attrs.pyi | 2 +- stubs/Markdown/markdown/extensions/meta.pyi | 3 ++- stubs/Markdown/markdown/extensions/toc.pyi | 3 ++- stubs/Markdown/markdown/inlinepatterns.pyi | 7 ++++--- stubs/Markdown/markdown/postprocessors.pyi | 3 ++- stubs/Markdown/markdown/preprocessors.pyi | 3 ++- stubs/Markdown/markdown/util.pyi | 3 ++- stubs/PyYAML/yaml/__init__.pyi | 3 ++- stubs/PyYAML/yaml/constructor.pyi | 3 ++- stubs/beautifulsoup4/bs4/element.pyi | 3 ++- stubs/bleach/bleach/linkifier.pyi | 3 ++- stubs/bleach/bleach/sanitizer.pyi | 3 ++- stubs/chardet/chardet/universaldetector.pyi | 2 +- stubs/colorama/colorama/ansitowin32.pyi | 3 ++- stubs/dateparser/dateparser/date.pyi | 3 ++- stubs/dateparser/dateparser/languages/locale.pyi | 7 +------ stubs/decorator/decorator.pyi | 3 ++- stubs/emoji/emoji/core.pyi | 2 +- stubs/entrypoints/entrypoints.pyi | 2 +- stubs/humanfriendly/humanfriendly/__init__.pyi | 3 ++- stubs/paramiko/paramiko/config.pyi | 3 ++- stubs/paramiko/paramiko/pkey.pyi | 3 ++- stubs/parsimonious/parsimonious/expressions.pyi | 3 ++- stubs/parsimonious/parsimonious/nodes.pyi | 3 ++- stubs/passpy/passpy/store.pyi | 2 +- stubs/pyflakes/pyflakes/api.pyi | 3 ++- stubs/pyflakes/pyflakes/checker.pyi | 3 ++- stubs/redis/redis/client.pyi | 3 ++- stubs/simplejson/simplejson/decoder.pyi | 3 ++- stubs/six/six/__init__.pyi | 3 ++- stubs/toml/toml/decoder.pyi | 3 ++- stubs/tqdm/tqdm/utils.pyi | 3 ++- stubs/waitress/waitress/parser.pyi | 3 ++- stubs/waitress/waitress/runner.pyi | 3 ++- stubs/waitress/waitress/utilities.pyi | 3 ++- stubs/whatthepatch/whatthepatch/patch.pyi | 3 ++- stubs/whatthepatch/whatthepatch/snippets.pyi | 2 +- stubs/zxcvbn/zxcvbn/matching.pyi | 3 ++- stubs/zxcvbn/zxcvbn/scoring.pyi | 2 +- 78 files changed, 142 insertions(+), 90 deletions(-) diff --git a/stdlib/argparse.pyi b/stdlib/argparse.pyi index fbe5de52d..1b86a4e10 100644 --- a/stdlib/argparse.pyi +++ b/stdlib/argparse.pyi @@ -1,6 +1,7 @@ import sys from collections.abc import Callable, Generator, Iterable, Sequence -from typing import IO, Any, Generic, NewType, NoReturn, Pattern, Protocol, TypeVar, overload +from re import Pattern +from typing import IO, Any, Generic, NewType, NoReturn, Protocol, TypeVar, overload from typing_extensions import Literal, TypeAlias __all__ = [ diff --git a/stdlib/configparser.pyi b/stdlib/configparser.pyi index d3043466f..98ddb95f5 100644 --- a/stdlib/configparser.pyi +++ b/stdlib/configparser.pyi @@ -1,7 +1,8 @@ import sys from _typeshed import StrOrBytesPath, SupportsWrite from collections.abc import Callable, ItemsView, Iterable, Iterator, Mapping, MutableMapping, Sequence -from typing import Any, ClassVar, Pattern, TypeVar, overload +from re import Pattern +from typing import Any, ClassVar, TypeVar, overload from typing_extensions import Literal, TypeAlias __all__ = [ diff --git a/stdlib/distutils/command/config.pyi b/stdlib/distutils/command/config.pyi index 7ad71e185..03466ca72 100644 --- a/stdlib/distutils/command/config.pyi +++ b/stdlib/distutils/command/config.pyi @@ -1,5 +1,6 @@ from collections.abc import Sequence -from typing import Any, Pattern +from re import Pattern +from typing import Any from ..ccompiler import CCompiler from ..cmd import Command diff --git a/stdlib/distutils/filelist.pyi b/stdlib/distutils/filelist.pyi index d8b87e251..1cfdcf08d 100644 --- a/stdlib/distutils/filelist.pyi +++ b/stdlib/distutils/filelist.pyi @@ -1,5 +1,6 @@ from collections.abc import Iterable -from typing import Pattern, overload +from re import Pattern +from typing import overload from typing_extensions import Literal # class is entirely undocumented diff --git a/stdlib/distutils/version.pyi b/stdlib/distutils/version.pyi index 8745e8c9f..627d45067 100644 --- a/stdlib/distutils/version.pyi +++ b/stdlib/distutils/version.pyi @@ -1,6 +1,6 @@ from _typeshed import Self from abc import abstractmethod -from typing import Pattern +from re import Pattern class Version: def __eq__(self, other: object) -> bool: ... diff --git a/stdlib/email/_header_value_parser.pyi b/stdlib/email/_header_value_parser.pyi index 7d1925c14..00d5c9882 100644 --- a/stdlib/email/_header_value_parser.pyi +++ b/stdlib/email/_header_value_parser.pyi @@ -3,7 +3,8 @@ from _typeshed import Self from collections.abc import Iterable, Iterator from email.errors import HeaderParseError, MessageDefect from email.policy import Policy -from typing import Any, Pattern +from re import Pattern +from typing import Any from typing_extensions import Final WSP: Final[set[str]] diff --git a/stdlib/html/parser.pyi b/stdlib/html/parser.pyi index 1731a3459..2948eadc9 100644 --- a/stdlib/html/parser.pyi +++ b/stdlib/html/parser.pyi @@ -1,5 +1,5 @@ from _markupbase import ParserBase -from typing import Pattern +from re import Pattern __all__ = ["HTMLParser"] diff --git a/stdlib/http/cookiejar.pyi b/stdlib/http/cookiejar.pyi index af33472a3..dc3c0e17d 100644 --- a/stdlib/http/cookiejar.pyi +++ b/stdlib/http/cookiejar.pyi @@ -2,7 +2,8 @@ import sys from _typeshed import StrPath from collections.abc import Iterable, Iterator, Sequence from http.client import HTTPResponse -from typing import ClassVar, Pattern, TypeVar, overload +from re import Pattern +from typing import ClassVar, TypeVar, overload from urllib.request import Request __all__ = [ diff --git a/stdlib/imaplib.pyi b/stdlib/imaplib.pyi index 6f0998198..a313b20a9 100644 --- a/stdlib/imaplib.pyi +++ b/stdlib/imaplib.pyi @@ -4,10 +4,11 @@ import time from _typeshed import Self from builtins import list as _list # conflicts with a method named "list" from collections.abc import Callable +from re import Pattern from socket import socket as _socket from ssl import SSLContext, SSLSocket from types import TracebackType -from typing import IO, Any, Pattern +from typing import IO, Any from typing_extensions import Literal, TypeAlias __all__ = ["IMAP4", "IMAP4_stream", "Internaldate2tuple", "Int2AP", "ParseFlags", "Time2Internaldate", "IMAP4_SSL"] diff --git a/stdlib/importlib/metadata/__init__.pyi b/stdlib/importlib/metadata/__init__.pyi index 6466ce0a2..e6bf1fa25 100644 --- a/stdlib/importlib/metadata/__init__.pyi +++ b/stdlib/importlib/metadata/__init__.pyi @@ -7,7 +7,8 @@ from email.message import Message from importlib.abc import MetaPathFinder from os import PathLike from pathlib import Path -from typing import Any, ClassVar, NamedTuple, Pattern, overload +from re import Pattern +from typing import Any, ClassVar, NamedTuple, overload __all__ = [ "Distribution", diff --git a/stdlib/json/encoder.pyi b/stdlib/json/encoder.pyi index ecd1fa78a..60e820619 100644 --- a/stdlib/json/encoder.pyi +++ b/stdlib/json/encoder.pyi @@ -1,5 +1,6 @@ from collections.abc import Callable, Iterator -from typing import Any, Pattern +from re import Pattern +from typing import Any ESCAPE: Pattern[str] ESCAPE_ASCII: Pattern[str] diff --git a/stdlib/lib2to3/pgen2/literals.pyi b/stdlib/lib2to3/pgen2/literals.pyi index 551ece19a..c3fabe8a5 100644 --- a/stdlib/lib2to3/pgen2/literals.pyi +++ b/stdlib/lib2to3/pgen2/literals.pyi @@ -1,4 +1,4 @@ -from typing import Match +from re import Match simple_escapes: dict[str, str] diff --git a/stdlib/logging/__init__.pyi b/stdlib/logging/__init__.pyi index 1e2f18da5..0d3e80ddc 100644 --- a/stdlib/logging/__init__.pyi +++ b/stdlib/logging/__init__.pyi @@ -3,10 +3,11 @@ import threading from _typeshed import Self, StrPath, SupportsWrite from collections.abc import Callable, Iterable, Mapping, MutableMapping, Sequence from io import TextIOWrapper +from re import Pattern from string import Template from time import struct_time from types import FrameType, TracebackType -from typing import Any, ClassVar, Generic, Pattern, TextIO, TypeVar, Union, overload +from typing import Any, ClassVar, Generic, TextIO, TypeVar, Union, overload from typing_extensions import Literal, TypeAlias if sys.version_info >= (3, 11): diff --git a/stdlib/logging/config.pyi b/stdlib/logging/config.pyi index f682f732b..12e222680 100644 --- a/stdlib/logging/config.pyi +++ b/stdlib/logging/config.pyi @@ -2,8 +2,9 @@ import sys from _typeshed import StrOrBytesPath from collections.abc import Callable, Sequence from configparser import RawConfigParser +from re import Pattern from threading import Thread -from typing import IO, Any, Pattern +from typing import IO, Any from . import _Level diff --git a/stdlib/logging/handlers.pyi b/stdlib/logging/handlers.pyi index db544a7fd..eec4ed969 100644 --- a/stdlib/logging/handlers.pyi +++ b/stdlib/logging/handlers.pyi @@ -6,8 +6,9 @@ from _typeshed import StrPath from collections.abc import Callable from logging import FileHandler, Handler, LogRecord from queue import Queue, SimpleQueue +from re import Pattern from socket import SocketKind, socket -from typing import Any, ClassVar, Pattern +from typing import Any, ClassVar DEFAULT_TCP_LOGGING_PORT: int DEFAULT_UDP_LOGGING_PORT: int diff --git a/stdlib/poplib.pyi b/stdlib/poplib.pyi index 487a72666..fd7afedaa 100644 --- a/stdlib/poplib.pyi +++ b/stdlib/poplib.pyi @@ -1,7 +1,8 @@ import socket import ssl from builtins import list as _list # conflicts with a method named "list" -from typing import Any, BinaryIO, NoReturn, Pattern, overload +from re import Pattern +from typing import Any, BinaryIO, NoReturn, overload from typing_extensions import Literal, TypeAlias __all__ = ["POP3", "error_proto", "POP3_SSL"] diff --git a/stdlib/smtplib.pyi b/stdlib/smtplib.pyi index 2e6eb0a22..c42841c43 100644 --- a/stdlib/smtplib.pyi +++ b/stdlib/smtplib.pyi @@ -2,10 +2,11 @@ import sys from _typeshed import Self from collections.abc import Sequence from email.message import Message as _Message +from re import Pattern from socket import socket from ssl import SSLContext from types import TracebackType -from typing import Any, Pattern, Protocol, overload +from typing import Any, Protocol, overload from typing_extensions import TypeAlias __all__ = [ diff --git a/stdlib/sre_compile.pyi b/stdlib/sre_compile.pyi index 98a9f4dad..a9f4d577d 100644 --- a/stdlib/sre_compile.pyi +++ b/stdlib/sre_compile.pyi @@ -1,7 +1,8 @@ +from re import Pattern from sre_constants import * from sre_constants import _NamedIntConstant from sre_parse import SubPattern -from typing import Any, Pattern +from typing import Any MAXCODE: int diff --git a/stdlib/sre_parse.pyi b/stdlib/sre_parse.pyi index ad0592239..e4d66d1ba 100644 --- a/stdlib/sre_parse.pyi +++ b/stdlib/sre_parse.pyi @@ -1,8 +1,9 @@ import sys from collections.abc import Iterable +from re import Match, Pattern as _Pattern from sre_constants import * from sre_constants import _NamedIntConstant as _NIC, error as _Error -from typing import Any, Match, Pattern as _Pattern, overload +from typing import Any, overload from typing_extensions import TypeAlias SPECIAL_CHARS: str diff --git a/stdlib/string.pyi b/stdlib/string.pyi index 525806a74..320178f44 100644 --- a/stdlib/string.pyi +++ b/stdlib/string.pyi @@ -1,13 +1,8 @@ import sys from collections.abc import Iterable, Mapping, Sequence -from re import RegexFlag +from re import Pattern, RegexFlag from typing import Any -if sys.version_info >= (3, 8): - from re import Pattern -else: - from typing import Pattern - __all__ = [ "ascii_letters", "ascii_lowercase", diff --git a/stdlib/telnetlib.pyi b/stdlib/telnetlib.pyi index 8edbd155f..5a4326c4a 100644 --- a/stdlib/telnetlib.pyi +++ b/stdlib/telnetlib.pyi @@ -1,8 +1,9 @@ import socket from _typeshed import Self from collections.abc import Callable, Sequence +from re import Match, Pattern from types import TracebackType -from typing import Any, Match, Pattern +from typing import Any __all__ = ["Telnet"] diff --git a/stdlib/textwrap.pyi b/stdlib/textwrap.pyi index 5a61dfedb..9e423cb5c 100644 --- a/stdlib/textwrap.pyi +++ b/stdlib/textwrap.pyi @@ -1,5 +1,5 @@ from collections.abc import Callable -from typing import Pattern +from re import Pattern __all__ = ["TextWrapper", "wrap", "fill", "dedent", "indent", "shorten"] diff --git a/stdlib/tokenize.pyi b/stdlib/tokenize.pyi index dddccc0a3..5ca0d2cd4 100644 --- a/stdlib/tokenize.pyi +++ b/stdlib/tokenize.pyi @@ -2,8 +2,9 @@ import sys from _typeshed import StrOrBytesPath from builtins import open as _builtin_open from collections.abc import Callable, Generator, Iterable, Sequence +from re import Pattern from token import * -from typing import Any, NamedTuple, Pattern, TextIO +from typing import Any, NamedTuple, TextIO from typing_extensions import TypeAlias __all__ = [ diff --git a/stdlib/unittest/case.pyi b/stdlib/unittest/case.pyi index 8892d4a5e..a78fb4a12 100644 --- a/stdlib/unittest/case.pyi +++ b/stdlib/unittest/case.pyi @@ -4,6 +4,7 @@ import unittest.result from _typeshed import Self, SupportsDunderGE, SupportsDunderGT, SupportsDunderLE, SupportsDunderLT, SupportsRSub, SupportsSub from collections.abc import Callable, Container, Iterable, Mapping, Sequence, Set as AbstractSet from contextlib import AbstractContextManager +from re import Pattern from types import TracebackType from typing import ( Any, @@ -12,7 +13,6 @@ from typing import ( Generic, NamedTuple, NoReturn, - Pattern, Protocol, SupportsAbs, SupportsRound, diff --git a/stdlib/unittest/loader.pyi b/stdlib/unittest/loader.pyi index 32e0bab4f..73b25c749 100644 --- a/stdlib/unittest/loader.pyi +++ b/stdlib/unittest/loader.pyi @@ -2,8 +2,9 @@ import unittest.case import unittest.result import unittest.suite from collections.abc import Callable, Sequence +from re import Pattern from types import ModuleType -from typing import Any, Pattern +from typing import Any from typing_extensions import TypeAlias _SortComparisonMethod: TypeAlias = Callable[[str, str], int] diff --git a/stdlib/urllib/request.pyi b/stdlib/urllib/request.pyi index c44e5cf70..0ad10a218 100644 --- a/stdlib/urllib/request.pyi +++ b/stdlib/urllib/request.pyi @@ -5,7 +5,8 @@ from collections.abc import Callable, Iterable, Mapping, MutableMapping, Sequenc from email.message import Message from http.client import HTTPMessage, HTTPResponse, _HTTPConnectionProtocol from http.cookiejar import CookieJar -from typing import IO, Any, ClassVar, NoReturn, Pattern, TypeVar, overload +from re import Pattern +from typing import IO, Any, ClassVar, NoReturn, TypeVar, overload from typing_extensions import TypeAlias from urllib.error import HTTPError as HTTPError from urllib.response import addclosehook, addinfourl diff --git a/stdlib/wsgiref/headers.pyi b/stdlib/wsgiref/headers.pyi index cde0227a7..dd963d9b4 100644 --- a/stdlib/wsgiref/headers.pyi +++ b/stdlib/wsgiref/headers.pyi @@ -1,4 +1,5 @@ -from typing import Pattern, overload +from re import Pattern +from typing import overload from typing_extensions import TypeAlias _HeaderList: TypeAlias = list[tuple[str, str]] diff --git a/stdlib/xml/etree/ElementPath.pyi b/stdlib/xml/etree/ElementPath.pyi index 1f652050e..c2cd4a668 100644 --- a/stdlib/xml/etree/ElementPath.pyi +++ b/stdlib/xml/etree/ElementPath.pyi @@ -1,5 +1,6 @@ from collections.abc import Callable, Generator -from typing import Pattern, TypeVar +from re import Pattern +from typing import TypeVar from typing_extensions import TypeAlias from xml.etree.ElementTree import Element diff --git a/stdlib/xmlrpc/server.pyi b/stdlib/xmlrpc/server.pyi index cb1a130ac..e4fc30034 100644 --- a/stdlib/xmlrpc/server.pyi +++ b/stdlib/xmlrpc/server.pyi @@ -3,7 +3,8 @@ import pydoc import socketserver from collections.abc import Callable, Iterable, Mapping from datetime import datetime -from typing import Any, ClassVar, Pattern, Protocol +from re import Pattern +from typing import Any, ClassVar, Protocol from typing_extensions import TypeAlias from xmlrpc.client import Fault diff --git a/stubs/Flask-Cors/flask_cors/core.pyi b/stubs/Flask-Cors/flask_cors/core.pyi index edf326cdf..52fabdf29 100644 --- a/stubs/Flask-Cors/flask_cors/core.pyi +++ b/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]) diff --git a/stubs/Flask-Cors/flask_cors/decorator.pyi b/stubs/Flask-Cors/flask_cors/decorator.pyi index 759a5dea8..8eb81d130 100644 --- a/stubs/Flask-Cors/flask_cors/decorator.pyi +++ b/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") diff --git a/stubs/Flask-SQLAlchemy/flask_sqlalchemy/model.pyi b/stubs/Flask-SQLAlchemy/flask_sqlalchemy/model.pyi index 24aec4589..b7f9a3485 100644 --- a/stubs/Flask-SQLAlchemy/flask_sqlalchemy/model.pyi +++ b/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 diff --git a/stubs/Markdown/markdown/blockprocessors.pyi b/stubs/Markdown/markdown/blockprocessors.pyi index 22eccbc14..d81ac2939 100644 --- a/stubs/Markdown/markdown/blockprocessors.pyi +++ b/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 diff --git a/stubs/Markdown/markdown/extensions/abbr.pyi b/stubs/Markdown/markdown/extensions/abbr.pyi index a3469d161..aafd0af49 100644 --- a/stubs/Markdown/markdown/extensions/abbr.pyi +++ b/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 diff --git a/stubs/Markdown/markdown/extensions/admonition.pyi b/stubs/Markdown/markdown/extensions/admonition.pyi index 912c6ced0..a7cf51085 100644 --- a/stubs/Markdown/markdown/extensions/admonition.pyi +++ b/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 diff --git a/stubs/Markdown/markdown/extensions/attr_list.pyi b/stubs/Markdown/markdown/extensions/attr_list.pyi index 416193a54..238d943d0 100644 --- a/stubs/Markdown/markdown/extensions/attr_list.pyi +++ b/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 diff --git a/stubs/Markdown/markdown/extensions/def_list.pyi b/stubs/Markdown/markdown/extensions/def_list.pyi index 187003c8a..48ef08d6a 100644 --- a/stubs/Markdown/markdown/extensions/def_list.pyi +++ b/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 diff --git a/stubs/Markdown/markdown/extensions/fenced_code.pyi b/stubs/Markdown/markdown/extensions/fenced_code.pyi index 9aab6be9b..2d26b070c 100644 --- a/stubs/Markdown/markdown/extensions/fenced_code.pyi +++ b/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 diff --git a/stubs/Markdown/markdown/extensions/footnotes.pyi b/stubs/Markdown/markdown/extensions/footnotes.pyi index b49e3a937..9786679b6 100644 --- a/stubs/Markdown/markdown/extensions/footnotes.pyi +++ b/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 diff --git a/stubs/Markdown/markdown/extensions/legacy_attrs.pyi b/stubs/Markdown/markdown/extensions/legacy_attrs.pyi index 6e068277f..30f2e0ac6 100644 --- a/stubs/Markdown/markdown/extensions/legacy_attrs.pyi +++ b/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 diff --git a/stubs/Markdown/markdown/extensions/meta.pyi b/stubs/Markdown/markdown/extensions/meta.pyi index f6c0621be..267d3c01a 100644 --- a/stubs/Markdown/markdown/extensions/meta.pyi +++ b/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 diff --git a/stubs/Markdown/markdown/extensions/toc.pyi b/stubs/Markdown/markdown/extensions/toc.pyi index 1315e77e4..453e3dcb4 100644 --- a/stubs/Markdown/markdown/extensions/toc.pyi +++ b/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 diff --git a/stubs/Markdown/markdown/inlinepatterns.pyi b/stubs/Markdown/markdown/inlinepatterns.pyi index 0fe488204..0e01f902b 100644 --- a/stubs/Markdown/markdown/inlinepatterns.pyi +++ b/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): ... diff --git a/stubs/Markdown/markdown/postprocessors.pyi b/stubs/Markdown/markdown/postprocessors.pyi index 47581da2f..c0e9eb438 100644 --- a/stubs/Markdown/markdown/postprocessors.pyi +++ b/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 diff --git a/stubs/Markdown/markdown/preprocessors.pyi b/stubs/Markdown/markdown/preprocessors.pyi index e0ebac0bf..9478ffdfb 100644 --- a/stubs/Markdown/markdown/preprocessors.pyi +++ b/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 diff --git a/stubs/Markdown/markdown/util.pyi b/stubs/Markdown/markdown/util.pyi index 789d8ca81..ade755a36 100644 --- a/stubs/Markdown/markdown/util.pyi +++ b/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]] diff --git a/stubs/PyYAML/yaml/__init__.pyi b/stubs/PyYAML/yaml/__init__.pyi index 6f6106f73..04b68a86a 100644 --- a/stubs/PyYAML/yaml/__init__.pyi +++ b/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 diff --git a/stubs/PyYAML/yaml/constructor.pyi b/stubs/PyYAML/yaml/constructor.pyi index 27928032a..75da27e7a 100644 --- a/stubs/PyYAML/yaml/constructor.pyi +++ b/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 diff --git a/stubs/beautifulsoup4/bs4/element.pyi b/stubs/beautifulsoup4/bs4/element.pyi index 97346985f..5f7521349 100644 --- a/stubs/beautifulsoup4/bs4/element.pyi +++ b/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 diff --git a/stubs/bleach/bleach/linkifier.pyi b/stubs/bleach/bleach/linkifier.pyi index 66abcccd3..fbe3d38a7 100644 --- a/stubs/bleach/bleach/linkifier.pyi +++ b/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 diff --git a/stubs/bleach/bleach/sanitizer.pyi b/stubs/bleach/bleach/sanitizer.pyi index f29a89768..810b61328 100644 --- a/stubs/bleach/bleach/sanitizer.pyi +++ b/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 diff --git a/stubs/chardet/chardet/universaldetector.pyi b/stubs/chardet/chardet/universaldetector.pyi index 6926f0428..a721160f8 100644 --- a/stubs/chardet/chardet/universaldetector.pyi +++ b/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): diff --git a/stubs/colorama/colorama/ansitowin32.pyi b/stubs/colorama/colorama/ansitowin32.pyi index 6e3359e7e..19a854c05 100644 --- a/stubs/colorama/colorama/ansitowin32.pyi +++ b/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": diff --git a/stubs/dateparser/dateparser/date.pyi b/stubs/dateparser/dateparser/date.pyi index 7d4926755..e5eed6369 100644 --- a/stubs/dateparser/dateparser/date.pyi +++ b/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 diff --git a/stubs/dateparser/dateparser/languages/locale.pyi b/stubs/dateparser/dateparser/languages/locale.pyi index 1c91e2659..2a06040b7 100644 --- a/stubs/dateparser/dateparser/languages/locale.pyi +++ b/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] diff --git a/stubs/decorator/decorator.pyi b/stubs/decorator/decorator.pyi index 40204d176..36dcfe813 100644 --- a/stubs/decorator/decorator.pyi +++ b/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]) diff --git a/stubs/emoji/emoji/core.pyi b/stubs/emoji/emoji/core.pyi index 7035e2c42..8b1e4c64c 100644 --- a/stubs/emoji/emoji/core.pyi +++ b/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 diff --git a/stubs/entrypoints/entrypoints.pyi b/stubs/entrypoints/entrypoints.pyi index d0d0bb609..15f19e99c 100644 --- a/stubs/entrypoints/entrypoints.pyi +++ b/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] diff --git a/stubs/humanfriendly/humanfriendly/__init__.pyi b/stubs/humanfriendly/humanfriendly/__init__.pyi index 40659454f..f906c2f25 100644 --- a/stubs/humanfriendly/humanfriendly/__init__.pyi +++ b/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 diff --git a/stubs/paramiko/paramiko/config.pyi b/stubs/paramiko/paramiko/config.pyi index f75c3ca75..3e100ed56 100644 --- a/stubs/paramiko/paramiko/config.pyi +++ b/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 diff --git a/stubs/paramiko/paramiko/pkey.pyi b/stubs/paramiko/paramiko/pkey.pyi index 899fb94ac..6dd72d5ff 100644 --- a/stubs/paramiko/paramiko/pkey.pyi +++ b/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 diff --git a/stubs/parsimonious/parsimonious/expressions.pyi b/stubs/parsimonious/parsimonious/expressions.pyi index 8f1e5bc8a..a6dbc314b 100644 --- a/stubs/parsimonious/parsimonious/expressions.pyi +++ b/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 diff --git a/stubs/parsimonious/parsimonious/nodes.pyi b/stubs/parsimonious/parsimonious/nodes.pyi index cb658ce35..15cfb6b64 100644 --- a/stubs/parsimonious/parsimonious/nodes.pyi +++ b/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 diff --git a/stubs/passpy/passpy/store.pyi b/stubs/passpy/passpy/store.pyi index d2a27049e..07a9fcc5e 100644 --- a/stubs/passpy/passpy/store.pyi +++ b/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__( diff --git a/stubs/pyflakes/pyflakes/api.pyi b/stubs/pyflakes/pyflakes/api.pyi index dcc9f7e6a..945a7a39c 100644 --- a/stubs/pyflakes/pyflakes/api.pyi +++ b/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 diff --git a/stubs/pyflakes/pyflakes/checker.pyi b/stubs/pyflakes/pyflakes/checker.pyi index 58a5d82e8..e6643760a 100644 --- a/stubs/pyflakes/pyflakes/checker.pyi +++ b/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 diff --git a/stubs/redis/redis/client.pyi b/stubs/redis/redis/client.pyi index 287651c1c..0ba5c326b 100644 --- a/stubs/redis/redis/client.pyi +++ b/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 diff --git a/stubs/simplejson/simplejson/decoder.pyi b/stubs/simplejson/simplejson/decoder.pyi index 72de138fd..babb0f633 100644 --- a/stubs/simplejson/simplejson/decoder.pyi +++ b/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: ... diff --git a/stubs/six/six/__init__.pyi b/stubs/six/six/__init__.pyi index 2189c70a3..7a084b3cc 100644 --- a/stubs/six/six/__init__.pyi +++ b/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 diff --git a/stubs/toml/toml/decoder.pyi b/stubs/toml/toml/decoder.pyi index 74f84d169..a492ac9e0 100644 --- a/stubs/toml/toml/decoder.pyi +++ b/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]) diff --git a/stubs/tqdm/tqdm/utils.pyi b/stubs/tqdm/tqdm/utils.pyi index 76b9ca621..3055987cd 100644 --- a/stubs/tqdm/tqdm/utils.pyi +++ b/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 diff --git a/stubs/waitress/waitress/parser.pyi b/stubs/waitress/waitress/parser.pyi index 1bdb9ad88..a3867aa44 100644 --- a/stubs/waitress/waitress/parser.pyi +++ b/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 diff --git a/stubs/waitress/waitress/runner.pyi b/stubs/waitress/waitress/runner.pyi index f34e064f1..aeced93f4 100644 --- a/stubs/waitress/waitress/runner.pyi +++ b/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] diff --git a/stubs/waitress/waitress/utilities.pyi b/stubs/waitress/waitress/utilities.pyi index caffa026a..cf3d44caf 100644 --- a/stubs/waitress/waitress/utilities.pyi +++ b/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 diff --git a/stubs/whatthepatch/whatthepatch/patch.pyi b/stubs/whatthepatch/whatthepatch/patch.pyi index dcabfa37d..9e03e3d91 100644 --- a/stubs/whatthepatch/whatthepatch/patch.pyi +++ b/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 diff --git a/stubs/whatthepatch/whatthepatch/snippets.pyi b/stubs/whatthepatch/whatthepatch/snippets.pyi index 3d867ddb3..edb748f56 100644 --- a/stubs/whatthepatch/whatthepatch/snippets.pyi +++ b/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]: ... diff --git a/stubs/zxcvbn/zxcvbn/matching.pyi b/stubs/zxcvbn/zxcvbn/matching.pyi index 8adf326a1..8d7871346 100644 --- a/stubs/zxcvbn/zxcvbn/matching.pyi +++ b/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 diff --git a/stubs/zxcvbn/zxcvbn/scoring.pyi b/stubs/zxcvbn/zxcvbn/scoring.pyi index 8567b357b..1d7d7be05 100644 --- a/stubs/zxcvbn/zxcvbn/scoring.pyi +++ b/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