From 366ea0129c66e679e80313324b08a12d4a001f79 Mon Sep 17 00:00:00 2001 From: sobolevn Date: Sat, 29 Oct 2022 15:09:51 +0300 Subject: [PATCH 1/2] zlib: improve bytes handling --- stdlib/zlib.pyi | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/stdlib/zlib.pyi b/stdlib/zlib.pyi index cfd6784bb771..1ac758f8f165 100644 --- a/stdlib/zlib.pyi +++ b/stdlib/zlib.pyi @@ -1,6 +1,5 @@ +from _typeshed import ReadableBuffer import sys -from array import array -from typing import Any from typing_extensions import Literal DEFLATED: Literal[8] @@ -29,7 +28,7 @@ Z_TREES: Literal[6] class error(Exception): ... class _Compress: - def compress(self, data: bytes) -> bytes: ... + def compress(self, data: ReadableBuffer) -> bytes: ... def flush(self, mode: int = ...) -> bytes: ... def copy(self) -> _Compress: ... @@ -37,21 +36,21 @@ class _Decompress: unused_data: bytes unconsumed_tail: bytes eof: bool - def decompress(self, data: bytes, max_length: int = ...) -> bytes: ... + def decompress(self, data: ReadableBuffer, max_length: int = ...) -> bytes: ... def flush(self, length: int = ...) -> bytes: ... def copy(self) -> _Decompress: ... -def adler32(__data: bytes, __value: int = ...) -> int: ... +def adler32(__data: ReadableBuffer, __value: int = ...) -> int: ... if sys.version_info >= (3, 11): - def compress(__data: bytes, level: int = ..., wbits: int = ...) -> bytes: ... + def compress(__data: ReadableBuffer, level: int = ..., wbits: int = ...) -> bytes: ... else: - def compress(__data: bytes, level: int = ...) -> bytes: ... + def compress(__data: ReadableBuffer, level: int = ...) -> bytes: ... def compressobj( - level: int = ..., method: int = ..., wbits: int = ..., memLevel: int = ..., strategy: int = ..., zdict: bytes | None = ... + level: int = ..., method: int = ..., wbits: int = ..., memLevel: int = ..., strategy: int = ..., zdict: ReadableBuffer | None = ... ) -> _Compress: ... -def crc32(__data: array[Any] | bytes, __value: int = ...) -> int: ... -def decompress(__data: bytes, wbits: int = ..., bufsize: int = ...) -> bytes: ... -def decompressobj(wbits: int = ..., zdict: bytes = ...) -> _Decompress: ... +def crc32(__data: ReadableBuffer, __value: int = ...) -> int: ... +def decompress(__data: ReadableBuffer, wbits: int = ..., bufsize: int = ...) -> bytes: ... +def decompressobj(wbits: int = ..., zdict: ReadableBuffer = ...) -> _Decompress: ... From 77a3d1dc3228e85fa6ebc8da8bd0af6552dc0d87 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Sat, 29 Oct 2022 12:16:25 +0000 Subject: [PATCH 2/2] [pre-commit.ci] auto fixes from pre-commit.com hooks --- stdlib/zlib.pyi | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/stdlib/zlib.pyi b/stdlib/zlib.pyi index 1ac758f8f165..ea41567eefc5 100644 --- a/stdlib/zlib.pyi +++ b/stdlib/zlib.pyi @@ -1,5 +1,5 @@ -from _typeshed import ReadableBuffer import sys +from _typeshed import ReadableBuffer from typing_extensions import Literal DEFLATED: Literal[8] @@ -49,7 +49,12 @@ else: def compress(__data: ReadableBuffer, level: int = ...) -> bytes: ... def compressobj( - level: int = ..., method: int = ..., wbits: int = ..., memLevel: int = ..., strategy: int = ..., zdict: ReadableBuffer | None = ... + level: int = ..., + method: int = ..., + wbits: int = ..., + memLevel: int = ..., + strategy: int = ..., + zdict: ReadableBuffer | None = ..., ) -> _Compress: ... def crc32(__data: ReadableBuffer, __value: int = ...) -> int: ... def decompress(__data: ReadableBuffer, wbits: int = ..., bufsize: int = ...) -> bytes: ...