Merge branch 'main' into codex/python315-paths

Author: JelleZijlstra

stdlib/@tests/stubtest_allowlists/py315.txt

@@ -60,55 +60,9 @@ annotationlib.ForwardRef.__resolved_str__
 annotationlib.ForwardRef.__resolved_str_cache__
 annotationlib.ForwardRef.__slots__
 annotationlib.ForwardRef.__stringifier_dict__
-argparse.ArgumentParser.__init__
-argparse.ArgumentParser._get_formatter
-argparse.ArgumentParser.format_help
-argparse.ArgumentParser.format_usage
-argparse.HelpFormatter.__init__
-array.typecodes
-ast.DictComp.value
-ast.Import.__match_args__
-ast.Import.is_lazy
-ast.ImportFrom.__match_args__
-ast.ImportFrom.is_lazy
-ast.dump
-ast.parse
 ast.type_param.__init__
-base64.a85decode
-base64.b16decode
-base64.b16encode
-base64.b32decode
-base64.b32encode
-base64.b32hexdecode
-base64.b32hexencode
+# base64.b64decode uses a private sentinel list as the default for parameters whose public types are bool/buffer.
 base64.b64decode
-base64.b64encode
-base64.b85decode
-base64.b85encode
-base64.urlsafe_b64decode
-base64.urlsafe_b64encode
-base64.z85decode
-base64.z85encode
-binascii.ASCII85_ALPHABET
-binascii.BASE32HEX_ALPHABET
-binascii.BASE32_ALPHABET
-binascii.BASE64_ALPHABET
-binascii.BASE85_ALPHABET
-binascii.BINHEX_ALPHABET
-binascii.CRYPT_ALPHABET
-binascii.URLSAFE_BASE64_ALPHABET
-binascii.UU_ALPHABET
-binascii.Z85_ALPHABET
-binascii.a2b_ascii85
-binascii.a2b_base32
-binascii.a2b_base64
-binascii.a2b_base85
-binascii.a2b_hex
-binascii.b2a_ascii85
-binascii.b2a_base32
-binascii.b2a_base64
-binascii.b2a_base85
-binascii.unhexlify
 codecs.backslashreplace_errors
 codecs.ignore_errors
 codecs.namereplace_errors
@@ -213,16 +167,6 @@ profiling.sampling.sample
 profiling.sampling.stack_collector
 profiling.sampling.string_table
 profiling.tracing
-re.Pattern.prefixmatch
-re.__all__
-re.prefixmatch
-shelve.BsdDbShelf.__init__
-shelve.DbfilenameShelf.__init__
-shelve.Shelf.__init__
-shelve.Shelf.reorganize
-shelve.ShelveError
-shelve.__all__
-shelve.open
 site.addsitedir
 site.addsitepackages
 site.addusersitepackages
@@ -246,7 +190,6 @@ sys.last_exc
 sys.lazy_modules
 sys.set_lazy_imports
 sys.set_lazy_imports_filter
-tarfile.TarFile.__init__
 threading.Condition.locked
 threading.__all__
 threading.concurrent_tee
@@ -296,8 +239,6 @@ typing.Union
 typing._SpecialForm.__mro_entries__
 typing_extensions.__all__
 typing_extensions.Protocol
-unittest._log._AssertLogsContext.__init__
-unittest.case.TestCase.assertLogs
 urllib.parse._DefragResultBase.geturl
 urllib.parse._ParseResultBase.geturl
 urllib.parse._SplitResultBase.geturl
@@ -306,18 +247,6 @@ urllib.parse.urlparse
 urllib.parse.urlsplit
 urllib.parse.urlunparse
 urllib.parse.urlunsplit
-warnings.WarningMessage.__init__
-wave.WAVE_FORMAT_EXTENSIBLE
-wave.WAVE_FORMAT_IEEE_FLOAT
-wave.Wave_read.getformat
-wave.Wave_read.getmark
-wave.Wave_read.getmarkers
-wave.Wave_write.getformat
-wave.Wave_write.getmark
-wave.Wave_write.getmarkers
-wave.Wave_write.setformat
-wave.Wave_write.setmark
-wave.__all__
 xml.etree.ElementTree.__all__
 xml.is_valid_name
 xml.utils

stdlib/_hashlib.pyi

@@ -59,7 +59,7 @@ def compare_digest(a: ReadableBuffer, b: ReadableBuffer, /) -> bool: ...
 @overload
 def compare_digest(a: AnyStr, b: AnyStr, /) -> bool: ...
 def get_fips_mode() -> int: ...
-def hmac_new(key: bytes | bytearray, msg: ReadableBuffer = b"", digestmod: _DigestMod = None) -> HMAC: ...
+def hmac_new(key: ReadableBuffer, msg: ReadableBuffer = b"", digestmod: _DigestMod = None) -> HMAC: ...
 
 if sys.version_info >= (3, 13):
     def new(
@@ -117,7 +117,7 @@ else:
     def openssl_shake_128(string: ReadableBuffer = b"", *, usedforsecurity: bool = True) -> HASHXOF: ...
     def openssl_shake_256(string: ReadableBuffer = b"", *, usedforsecurity: bool = True) -> HASHXOF: ...
 
-def hmac_digest(key: bytes | bytearray, msg: ReadableBuffer, digest: str) -> bytes: ...
+def hmac_digest(key: ReadableBuffer, msg: ReadableBuffer, digest: str) -> bytes: ...
 def pbkdf2_hmac(
     hash_name: str, password: ReadableBuffer, salt: ReadableBuffer, iterations: int, dklen: int | None = None
 ) -> bytes: ...

stdlib/_zstd.pyi

@@ -74,7 +74,7 @@ class ZstdDecompressor:
 
 @final
 class ZstdDict:
-    def __new__(cls, dict_content: bytes, /, *, is_raw: bool = False) -> Self: ...
+    def __new__(cls, dict_content: ReadableBuffer, /, *, is_raw: bool = False) -> Self: ...
     def __len__(self, /) -> int: ...
     @property
     def as_digested_dict(self) -> tuple[Self, int]: ...

stdlib/argparse.pyi

@@ -161,7 +161,28 @@ class ArgumentParser(_AttributeHolder, _ActionsContainer):
     _subparsers: _ArgumentGroup | None
 
     # Note: the constructor arguments are also used in _SubParsersAction.add_parser.
-    if sys.version_info >= (3, 14):
+    if sys.version_info >= (3, 15):
+        def __init__(
+            self,
+            prog: str | None = None,
+            usage: str | None = None,
+            description: str | None = None,
+            epilog: str | None = None,
+            parents: Iterable[ArgumentParser] = [],
+            formatter_class: _FormatterClass = ...,
+            prefix_chars: str = "-",
+            fromfile_prefix_chars: str | None = None,
+            argument_default: Any = None,
+            conflict_handler: str = "error",
+            add_help: bool = True,
+            allow_abbrev: bool = True,
+            exit_on_error: bool = True,
+            *,
+            suggest_on_error: bool = True,
+            color: bool = True,
+        ) -> None: ...
+
+    elif sys.version_info >= (3, 14):
         def __init__(
             self,
             prog: str | None = None,
@@ -236,8 +257,14 @@ class ArgumentParser(_AttributeHolder, _ActionsContainer):
     ) -> _SubParsersAction[_ArgumentParserT]: ...
     def print_usage(self, file: SupportsWrite[str] | None = None) -> None: ...
     def print_help(self, file: SupportsWrite[str] | None = None) -> None: ...
-    def format_usage(self) -> str: ...
-    def format_help(self) -> str: ...
+    if sys.version_info >= (3, 15):
+        def format_usage(self, formatter: HelpFormatter | None = None) -> str: ...
+        def format_help(self, formatter: HelpFormatter | None = None) -> str: ...
+
+    else:
+        def format_usage(self) -> str: ...
+        def format_help(self) -> str: ...
+
     @overload
     def parse_known_args(self, args: Iterable[str] | None = None, namespace: None = None) -> tuple[Namespace, list[str]]: ...
     @overload
@@ -284,7 +311,11 @@ class ArgumentParser(_AttributeHolder, _ActionsContainer):
     def _get_values(self, action: Action, arg_strings: list[str]) -> Any: ...
     def _get_value(self, action: Action, arg_string: str) -> Any: ...
     def _check_value(self, action: Action, value: Any) -> None: ...
-    def _get_formatter(self) -> HelpFormatter: ...
+    if sys.version_info >= (3, 15):
+        def _get_formatter(self, file: SupportsWrite[str] | None = None) -> HelpFormatter: ...
+    else:
+        def _get_formatter(self) -> HelpFormatter: ...
+
     def _print_message(self, message: str, file: SupportsWrite[str] | None = None) -> None: ...
 
 class HelpFormatter:
@@ -309,7 +340,12 @@ class HelpFormatter:
         def __init__(self, formatter: HelpFormatter, parent: Self | None, heading: str | None = None) -> None: ...
         def format_help(self) -> str: ...
 
-    if sys.version_info >= (3, 14):
+    if sys.version_info >= (3, 15):
+        def __init__(
+            self, prog: str, indent_increment: int = 2, max_help_position: int = 24, width: int | None = None
+        ) -> None: ...
+
+    elif sys.version_info >= (3, 14):
         def __init__(
             self, prog: str, indent_increment: int = 2, max_help_position: int = 24, width: int | None = None, color: bool = True
         ) -> None: ...

stdlib/array.pyi

@@ -6,7 +6,10 @@ from typing import Any, ClassVar, Literal, SupportsIndex, TypeAlias, TypeVar, ov
 from typing_extensions import Self, deprecated, disjoint_base
 
 _IntTypeCode: TypeAlias = Literal["b", "B", "h", "H", "i", "I", "l", "L", "q", "Q"]
-_FloatTypeCode: TypeAlias = Literal["f", "d"]
+if sys.version_info >= (3, 15):
+    _FloatTypeCode: TypeAlias = Literal["f", "d", "e", "Zf", "Zd"]
+else:
+    _FloatTypeCode: TypeAlias = Literal["f", "d"]
 if sys.version_info >= (3, 13):
     _UnicodeTypeCode: TypeAlias = Literal["u", "w"]
 else:
@@ -15,7 +18,10 @@ _TypeCode: TypeAlias = _IntTypeCode | _FloatTypeCode | _UnicodeTypeCode
 
 _T = TypeVar("_T", int, float, str)
 
-typecodes: str
+if sys.version_info >= (3, 15):
+    typecodes: tuple[str, ...]
+else:
+    typecodes: str
 
 @disjoint_base
 class array(MutableSequence[_T]):