From 8ecea25b951e8d603e59f6fbdacc306e42c0201b Mon Sep 17 00:00:00 2001 From: sobolevn Date: Sat, 29 Oct 2022 14:38:39 +0300 Subject: [PATCH 1/3] asyncore: improve bytes handling --- stdlib/asyncore.pyi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/stdlib/asyncore.pyi b/stdlib/asyncore.pyi index 0025ec3f9b4e..15468f2e76f7 100644 --- a/stdlib/asyncore.pyi +++ b/stdlib/asyncore.pyi @@ -45,7 +45,7 @@ class dispatcher: def bind(self, addr: tuple[Any, ...] | str) -> None: ... def connect(self, address: tuple[Any, ...] | str) -> None: ... def accept(self) -> tuple[_Socket, Any] | None: ... - def send(self, data: bytes) -> int: ... + def send(self, data: ReadableBuffer) -> int: ... def recv(self, buffer_size: int) -> bytes: ... def close(self) -> None: ... def log(self, message: Any) -> None: ... @@ -80,8 +80,8 @@ if sys.platform != "win32": def getsockopt(self, level: int, optname: int, buflen: None = ...) -> int: ... @overload def getsockopt(self, level: int, optname: int, buflen: int) -> bytes: ... - def read(self, bufsize: int, flags: int = ...) -> bytes: ... - def write(self, data: bytes, flags: int = ...) -> int: ... + read = recv + write = send def close(self) -> None: ... def fileno(self) -> int: ... From 2fe622ede16774227ba519cce32250f5acaaff77 Mon Sep 17 00:00:00 2001 From: Nikita Sobolev Date: Sat, 29 Oct 2022 14:40:16 +0300 Subject: [PATCH 2/3] Update asyncore.pyi --- stdlib/asyncore.pyi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stdlib/asyncore.pyi b/stdlib/asyncore.pyi index 15468f2e76f7..5412dd276ed3 100644 --- a/stdlib/asyncore.pyi +++ b/stdlib/asyncore.pyi @@ -1,5 +1,5 @@ import sys -from _typeshed import FileDescriptorLike +from _typeshed import FileDescriptorLike, ReadableBuffer from socket import socket from typing import Any, overload from typing_extensions import TypeAlias From 55a306d8860fcd80f0968123c79cfedee63efa1f Mon Sep 17 00:00:00 2001 From: Nikita Sobolev Date: Sat, 29 Oct 2022 14:58:58 +0300 Subject: [PATCH 3/3] Update asyncore.pyi --- stdlib/asyncore.pyi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stdlib/asyncore.pyi b/stdlib/asyncore.pyi index 5412dd276ed3..565deb4d1cad 100644 --- a/stdlib/asyncore.pyi +++ b/stdlib/asyncore.pyi @@ -80,8 +80,8 @@ if sys.platform != "win32": def getsockopt(self, level: int, optname: int, buflen: None = ...) -> int: ... @overload def getsockopt(self, level: int, optname: int, buflen: int) -> bytes: ... - read = recv - write = send + def read(self, bufsize: int, flags: int = ...) -> bytes: ... + def write(self, data: bytes, flags: int = ...) -> int: ... def close(self) -> None: ... def fileno(self) -> int: ...