diff --git a/stdlib/_zstd.pyi b/stdlib/_zstd.pyi index f5e98ef88bb9..e40c7d12b6e7 100644 --- a/stdlib/_zstd.pyi +++ b/stdlib/_zstd.pyi @@ -46,7 +46,10 @@ class ZstdCompressor: FLUSH_BLOCK: Final = 1 FLUSH_FRAME: Final = 2 def __new__( - cls, level: int | None = None, options: Mapping[int, int] | None = None, zstd_dict: ZstdDict | None = None + cls, + level: int | None = None, + options: Mapping[int, int] | None = None, + zstd_dict: ZstdDict | tuple[ZstdDict, int] | None = None, ) -> Self: ... def compress( self, /, data: ReadableBuffer, mode: _ZstdCompressorContinue | _ZstdCompressorFlushBlock | _ZstdCompressorFlushFrame = 0 @@ -58,7 +61,9 @@ class ZstdCompressor: @final class ZstdDecompressor: - def __new__(cls, zstd_dict: ZstdDict | None = None, options: Mapping[int, int] | None = None) -> Self: ... + def __new__( + cls, zstd_dict: ZstdDict | tuple[ZstdDict, int] | None = None, options: Mapping[int, int] | None = None + ) -> Self: ... def decompress(self, /, data: ReadableBuffer, max_length: int = -1) -> bytes: ... @property def eof(self) -> bool: ... diff --git a/stdlib/compression/zstd/__init__.pyi b/stdlib/compression/zstd/__init__.pyi index d5da4be03612..acfbe4913b5d 100644 --- a/stdlib/compression/zstd/__init__.pyi +++ b/stdlib/compression/zstd/__init__.pyi @@ -44,9 +44,14 @@ def get_frame_info(frame_buffer: ReadableBuffer) -> FrameInfo: ... def train_dict(samples: Iterable[ReadableBuffer], dict_size: int) -> ZstdDict: ... def finalize_dict(zstd_dict: ZstdDict, /, samples: Iterable[ReadableBuffer], dict_size: int, level: int) -> ZstdDict: ... def compress( - data: ReadableBuffer, level: int | None = None, options: Mapping[int, int] | None = None, zstd_dict: ZstdDict | None = None + data: ReadableBuffer, + level: int | None = None, + options: Mapping[int, int] | None = None, + zstd_dict: ZstdDict | tuple[ZstdDict, int] | None = None, +) -> bytes: ... +def decompress( + data: ReadableBuffer, zstd_dict: ZstdDict | tuple[ZstdDict, int] | None = None, options: Mapping[int, int] | None = None ) -> bytes: ... -def decompress(data: ReadableBuffer, zstd_dict: ZstdDict | None = None, options: Mapping[int, int] | None = None) -> bytes: ... @final class CompressionParameter(enum.IntEnum): compression_level = _zstd.ZSTD_c_compressionLevel diff --git a/stdlib/compression/zstd/_zstdfile.pyi b/stdlib/compression/zstd/_zstdfile.pyi index e67b3d992f2f..d37e6b174166 100644 --- a/stdlib/compression/zstd/_zstdfile.pyi +++ b/stdlib/compression/zstd/_zstdfile.pyi @@ -36,7 +36,7 @@ class ZstdFile(_streams.BaseStream): *, level: None = None, options: Mapping[int, int] | None = None, - zstd_dict: ZstdDict | None = None, + zstd_dict: ZstdDict | tuple[ZstdDict, int] | None = None, ) -> None: ... @overload def __init__( @@ -47,7 +47,7 @@ class ZstdFile(_streams.BaseStream): *, level: int | None = None, options: Mapping[int, int] | None = None, - zstd_dict: ZstdDict | None = None, + zstd_dict: ZstdDict | tuple[ZstdDict, int] | None = None, ) -> None: ... def write(self, data: ReadableBuffer, /) -> int: ... def flush(self, mode: _ZstdCompressorFlushBlock | _ZstdCompressorFlushFrame = 1) -> bytes: ... # type: ignore[override] @@ -71,7 +71,7 @@ def open( *, level: None = None, options: Mapping[int, int] | None = None, - zstd_dict: ZstdDict | None = None, + zstd_dict: ZstdDict | tuple[ZstdDict, int] | None = None, encoding: str | None = None, errors: str | None = None, newline: str | None = None, @@ -84,7 +84,7 @@ def open( *, level: int | None = None, options: Mapping[int, int] | None = None, - zstd_dict: ZstdDict | None = None, + zstd_dict: ZstdDict | tuple[ZstdDict, int] | None = None, encoding: str | None = None, errors: str | None = None, newline: str | None = None, @@ -97,7 +97,7 @@ def open( *, level: None = None, options: Mapping[int, int] | None = None, - zstd_dict: ZstdDict | None = None, + zstd_dict: ZstdDict | tuple[ZstdDict, int] | None = None, encoding: str | None = None, errors: str | None = None, newline: str | None = None, @@ -110,7 +110,7 @@ def open( *, level: int | None = None, options: Mapping[int, int] | None = None, - zstd_dict: ZstdDict | None = None, + zstd_dict: ZstdDict | tuple[ZstdDict, int] | None = None, encoding: str | None = None, errors: str | None = None, newline: str | None = None, diff --git a/stdlib/tarfile.pyi b/stdlib/tarfile.pyi index f6623ea9929d..4ef096be330e 100644 --- a/stdlib/tarfile.pyi +++ b/stdlib/tarfile.pyi @@ -214,7 +214,7 @@ class TarFile: errorlevel: int | None = ..., level: None = None, options: Mapping[int, int] | None = None, - zstd_dict: ZstdDict | None = None, + zstd_dict: ZstdDict | tuple[ZstdDict, int] | None = None, ) -> Self: ... @overload @@ -355,7 +355,7 @@ class TarFile: debug: int | None = ..., errorlevel: int | None = ..., options: Mapping[int, int] | None = None, - zstd_dict: ZstdDict | None = None, + zstd_dict: ZstdDict | tuple[ZstdDict, int] | None = None, ) -> Self: ... @overload @classmethod @@ -376,7 +376,7 @@ class TarFile: debug: int | None = ..., errorlevel: int | None = ..., options: Mapping[int, int] | None = None, - zstd_dict: ZstdDict | None = None, + zstd_dict: ZstdDict | tuple[ZstdDict, int] | None = None, ) -> Self: ... @overload @@ -611,7 +611,7 @@ class TarFile: fileobj: IO[bytes] | None = None, level: None = None, options: Mapping[int, int] | None = None, - zstd_dict: ZstdDict | None = None, + zstd_dict: ZstdDict | tuple[ZstdDict, int] | None = None, *, format: int | None = ..., tarinfo: type[TarInfo] | None = ..., @@ -631,7 +631,7 @@ class TarFile: fileobj: IO[bytes] | None = None, level: int | None = None, options: Mapping[int, int] | None = None, - zstd_dict: ZstdDict | None = None, + zstd_dict: ZstdDict | tuple[ZstdDict, int] | None = None, *, format: int | None = ..., tarinfo: type[TarInfo] | None = ...,