From 6097695865128702b72a31667c82b7ea71d098f9 Mon Sep 17 00:00:00 2001 From: hauntsaninja Date: Sat, 18 May 2024 17:19:21 -0400 Subject: [PATCH 1/3] re: update for py313 --- stdlib/re.pyi | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/stdlib/re.pyi b/stdlib/re.pyi index 44a88c385222..1b9c1aba808a 100644 --- a/stdlib/re.pyi +++ b/stdlib/re.pyi @@ -1,4 +1,5 @@ import enum +import sre_constants import sre_compile import sys from _typeshed import ReadableBuffer @@ -21,7 +22,6 @@ __all__ = [ "finditer", "compile", "purge", - "template", "escape", "error", "A", @@ -41,10 +41,17 @@ __all__ = [ "Match", "Pattern", ] +if sys.version_info < (3, 13): + __all__ += ["template"] if sys.version_info >= (3, 11): __all__ += ["NOFLAG", "RegexFlag"] +if sys.version_info >= (3, 13): + __all__ += ["PatternError"] + +PatternError = sre_constants.error + _T = TypeVar("_T") @final @@ -198,8 +205,9 @@ class RegexFlag(enum.IntFlag): VERBOSE = X U = sre_compile.SRE_FLAG_UNICODE UNICODE = U - T = sre_compile.SRE_FLAG_TEMPLATE - TEMPLATE = T + if sys.version_info < (3, 13): + T = sre_compile.SRE_FLAG_TEMPLATE + TEMPLATE = T if sys.version_info >= (3, 11): NOFLAG = 0 @@ -218,8 +226,9 @@ X = RegexFlag.X VERBOSE = RegexFlag.VERBOSE U = RegexFlag.U UNICODE = RegexFlag.UNICODE -T = RegexFlag.T -TEMPLATE = RegexFlag.TEMPLATE +if sys.version_info < (3, 13): + T = RegexFlag.T + TEMPLATE = RegexFlag.TEMPLATE if sys.version_info >= (3, 11): NOFLAG = RegexFlag.NOFLAG _FlagsType: TypeAlias = int | RegexFlag @@ -287,4 +296,5 @@ def subn( ) -> tuple[bytes, int]: ... def escape(pattern: AnyStr) -> AnyStr: ... def purge() -> None: ... -def template(pattern: AnyStr | Pattern[AnyStr], flags: _FlagsType = 0) -> Pattern[AnyStr]: ... +if sys.version_info < (3, 13): + def template(pattern: AnyStr | Pattern[AnyStr], flags: _FlagsType = 0) -> Pattern[AnyStr]: ... From 6b3efabde2857ef886ee6f747ada27d8c3de7a42 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Sat, 18 May 2024 21:21:08 +0000 Subject: [PATCH 2/3] [pre-commit.ci] auto fixes from pre-commit.com hooks --- stdlib/re.pyi | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/stdlib/re.pyi b/stdlib/re.pyi index 1b9c1aba808a..ad36ae6c1b44 100644 --- a/stdlib/re.pyi +++ b/stdlib/re.pyi @@ -1,6 +1,6 @@ import enum -import sre_constants import sre_compile +import sre_constants import sys from _typeshed import ReadableBuffer from collections.abc import Callable, Iterator, Mapping @@ -296,5 +296,6 @@ def subn( ) -> tuple[bytes, int]: ... def escape(pattern: AnyStr) -> AnyStr: ... def purge() -> None: ... + if sys.version_info < (3, 13): def template(pattern: AnyStr | Pattern[AnyStr], flags: _FlagsType = 0) -> Pattern[AnyStr]: ... From 812fd6a78544e7752bc22e8ac2f4f5e7cc4af659 Mon Sep 17 00:00:00 2001 From: Shantanu <12621235+hauntsaninja@users.noreply.github.com> Date: Sat, 18 May 2024 14:25:44 -0700 Subject: [PATCH 3/3] Update stdlib/re.pyi Co-authored-by: Jelle Zijlstra --- stdlib/re.pyi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stdlib/re.pyi b/stdlib/re.pyi index ad36ae6c1b44..37763827f7fd 100644 --- a/stdlib/re.pyi +++ b/stdlib/re.pyi @@ -50,7 +50,7 @@ if sys.version_info >= (3, 11): if sys.version_info >= (3, 13): __all__ += ["PatternError"] -PatternError = sre_constants.error + PatternError = sre_constants.error _T = TypeVar("_T")