re: 3.11 fixes (#7859)

This commit is contained in:
Jelle Zijlstra
2022-05-17 21:42:23 -07:00
committed by GitHub
parent bd394d2486
commit 7998906226
4 changed files with 18 additions and 20 deletions

View File

@@ -25,7 +25,6 @@ if sys.version_info >= (3, 11):
"finditer",
"compile",
"purge",
"template",
"escape",
"error",
"Pattern",
@@ -126,8 +125,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, 11):
T = sre_compile.SRE_FLAG_TEMPLATE
TEMPLATE = T
if sys.version_info >= (3, 11):
NOFLAG: int
@@ -146,8 +146,9 @@ X = RegexFlag.X
VERBOSE = RegexFlag.VERBOSE
U = RegexFlag.U
UNICODE = RegexFlag.UNICODE
T = RegexFlag.T
TEMPLATE = RegexFlag.TEMPLATE
if sys.version_info < (3, 11):
T = RegexFlag.T
TEMPLATE = RegexFlag.TEMPLATE
if sys.version_info >= (3, 11):
NOFLAG = RegexFlag.NOFLAG
_FlagsType: TypeAlias = int | RegexFlag
@@ -219,4 +220,6 @@ def subn(
) -> tuple[bytes, int]: ...
def escape(pattern: AnyStr) -> AnyStr: ...
def purge() -> None: ...
def template(pattern: AnyStr | Pattern[AnyStr], flags: _FlagsType = ...) -> Pattern[AnyStr]: ...
if sys.version_info < (3, 11):
def template(pattern: AnyStr | Pattern[AnyStr], flags: _FlagsType = ...) -> Pattern[AnyStr]: ...

View File

@@ -31,7 +31,8 @@ AT_LOCALE: dict[_NamedIntConstant, _NamedIntConstant]
AT_UNICODE: dict[_NamedIntConstant, _NamedIntConstant]
CH_LOCALE: dict[_NamedIntConstant, _NamedIntConstant]
CH_UNICODE: dict[_NamedIntConstant, _NamedIntConstant]
SRE_FLAG_TEMPLATE: int
if sys.version_info < (3, 11):
SRE_FLAG_TEMPLATE: int
SRE_FLAG_IGNORECASE: int
SRE_FLAG_LOCALE: int
SRE_FLAG_MULTILINE: int
@@ -55,7 +56,8 @@ ASSERT: _NamedIntConstant
ASSERT_NOT: _NamedIntConstant
AT: _NamedIntConstant
BRANCH: _NamedIntConstant
CALL: _NamedIntConstant
if sys.version_info < (3, 11):
CALL: _NamedIntConstant
CATEGORY: _NamedIntConstant
CHARSET: _NamedIntConstant
BIGCHARSET: _NamedIntConstant

View File

@@ -19,7 +19,8 @@ if sys.version_info >= (3, 7):
TYPE_FLAGS: int
GLOBAL_FLAGS: int
class Verbose(Exception): ...
if sys.version_info < (3, 11):
class Verbose(Exception): ...
class _State:
flags: int
@@ -87,6 +88,9 @@ class Tokenizer:
def seek(self, index: int) -> None: ...
def error(self, msg: str, offset: int = ...) -> _Error: ...
if sys.version_info >= (3, 11):
def checkgroupname(self, name: str, offset: int, nested: int) -> None: ...
def fix_flags(src: str | bytes, flags: int) -> int: ...
_TemplateType: TypeAlias = tuple[list[tuple[int, int]], list[str | None]]

View File

@@ -124,19 +124,8 @@ pyexpat.errors.XML_ERROR_RESERVED_PREFIX_XML
pyexpat.errors.XML_ERROR_RESERVED_PREFIX_XMLNS
queue.SimpleQueue.__init__
re.Pattern.scanner # Undocumented and not useful. #6405
re.T
re.TEMPLATE
re.template
shutil.rmtree
socketserver.UDPServer.allow_reuse_port
sre_compile.CALL
sre_compile.SRE_FLAG_TEMPLATE
sre_constants.CALL
sre_constants.SRE_FLAG_TEMPLATE
sre_parse.CALL
sre_parse.SRE_FLAG_TEMPLATE
sre_parse.Tokenizer.checkgroupname
sre_parse.Verbose
string.Template.get_identifiers
string.Template.is_valid
subprocess.getoutput