From f791ce0c77c1d719790cb78a3ced1e04f60b9029 Mon Sep 17 00:00:00 2001 From: sobolevn Date: Mon, 31 Oct 2022 22:41:33 +0300 Subject: [PATCH 1/4] marshal: improve bytes handling --- stdlib/marshal.pyi | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/stdlib/marshal.pyi b/stdlib/marshal.pyi index b2fde674a647..1931690fb57a 100644 --- a/stdlib/marshal.pyi +++ b/stdlib/marshal.pyi @@ -1,3 +1,4 @@ +from _typeshed import ReadableBuffer from typing import IO, Any version: int @@ -5,4 +6,4 @@ version: int def dump(__value: Any, __file: IO[Any], __version: int = ...) -> None: ... def load(__file: IO[Any]) -> Any: ... def dumps(__value: Any, __version: int = ...) -> bytes: ... -def loads(__bytes: bytes) -> Any: ... +def loads(__bytes: ReadableBuffer) -> Any: ... From f316f1e6ac3ccd0660580bedc0553a24153c7683 Mon Sep 17 00:00:00 2001 From: Nikita Sobolev Date: Mon, 31 Oct 2022 23:04:36 +0300 Subject: [PATCH 2/4] Update stdlib/marshal.pyi Co-authored-by: Jelle Zijlstra --- stdlib/marshal.pyi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stdlib/marshal.pyi b/stdlib/marshal.pyi index 1931690fb57a..1f8c420bae8f 100644 --- a/stdlib/marshal.pyi +++ b/stdlib/marshal.pyi @@ -3,7 +3,7 @@ from typing import IO, Any version: int -def dump(__value: Any, __file: IO[Any], __version: int = ...) -> None: ... -def load(__file: IO[Any]) -> Any: ... +def dump(__value: Any, __file: SupportsWrite[bytes], __version: int = ...) -> None: ... +def load(__file: SupportsRead[bytes]) -> Any: ... def dumps(__value: Any, __version: int = ...) -> bytes: ... def loads(__bytes: ReadableBuffer) -> Any: ... From 93176a771cabbc2b9d7b8900ebc5e45e7cc862f9 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 31 Oct 2022 20:08:12 +0000 Subject: [PATCH 3/4] [pre-commit.ci] auto fixes from pre-commit.com hooks --- stdlib/marshal.pyi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stdlib/marshal.pyi b/stdlib/marshal.pyi index 1f8c420bae8f..7cc0d1117fa9 100644 --- a/stdlib/marshal.pyi +++ b/stdlib/marshal.pyi @@ -1,5 +1,5 @@ from _typeshed import ReadableBuffer -from typing import IO, Any +from typing import Any version: int From 724c33024ef5c53a803829a2955648022c6df99d Mon Sep 17 00:00:00 2001 From: Nikita Sobolev Date: Mon, 31 Oct 2022 23:11:52 +0300 Subject: [PATCH 4/4] Update marshal.pyi --- stdlib/marshal.pyi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stdlib/marshal.pyi b/stdlib/marshal.pyi index 7cc0d1117fa9..d68cdd143109 100644 --- a/stdlib/marshal.pyi +++ b/stdlib/marshal.pyi @@ -1,4 +1,4 @@ -from _typeshed import ReadableBuffer +from _typeshed import ReadableBuffer, SupportsRead, SupportsWrite from typing import Any version: int