Sync typeshed (#14228)

Sync typeshed Source commit: python/typeshed@87d2683
python · Dec 1, 2022 · 6e9227a · 6e9227a
1 parent d3427c1
commit 6e9227a
Show file tree

Hide file tree

Showing 15 changed files with 234 additions and 120 deletions.
diff --git a/mypy/typeshed/stdlib/_typeshed/__init__.pyi b/mypy/typeshed/stdlib/_typeshed/__init__.pyi
@@ -236,6 +236,29 @@ else:
 ReadableBuffer: TypeAlias = ReadOnlyBuffer | WriteableBuffer # stable
 _BufferWithLen: TypeAlias = ReadableBuffer # not stable # noqa: Y047
 
+# Anything that implements the read-write buffer interface, and can be sliced/indexed.
+SliceableBuffer: TypeAlias = bytes | bytearray | memoryview | array.array[Any] | mmap.mmap
+IndexableBuffer: TypeAlias = bytes | bytearray | memoryview | array.array[Any] | mmap.mmap
+# https://github.com/python/typeshed/pull/9115#issuecomment-1304905864
+# Post PEP 688, they should be rewritten as such:
+# from collections.abc import Sequence
+# from typing import Sized, overload
+# class SliceableBuffer(Protocol):
+# def __buffer__(self, __flags: int) -> memoryview: ...
+# def __getitem__(self, __slice: slice) -> Sequence[int]: ...
+# class IndexableBuffer(Protocol):
+# def __buffer__(self, __flags: int) -> memoryview: ...
+# def __getitem__(self, __i: int) -> int: ...
+# class SupportsGetItemBuffer(SliceableBuffer, IndexableBuffer, Protocol):
+# def __buffer__(self, __flags: int) -> memoryview: ...
+# def __contains__(self, __x: Any) -> bool: ...
+# @overload
+# def __getitem__(self, __slice: slice) -> Sequence[int]: ...
+# @overload
+# def __getitem__(self, __i: int) -> int: ...
+# class SizedBuffer(Sized, Protocol): # instead of _BufferWithLen
+# def __buffer__(self, __flags: int) -> memoryview: ...
+
 ExcInfo: TypeAlias = tuple[type[BaseException], BaseException, TracebackType]
 OptExcInfo: TypeAlias = Union[ExcInfo, tuple[None, None, None]]
 
@@ -276,5 +299,4 @@ StrOrLiteralStr = TypeVar("StrOrLiteralStr", LiteralString, str) # noqa: Y001
 ProfileFunction: TypeAlias = Callable[[FrameType, str, Any], object]
 
 # Objects suitable to be passed to sys.settrace, threading.settrace, and similar
-# TODO: Ideally this would be a recursive type alias
-TraceFunction: TypeAlias = Callable[[FrameType, str, Any], Callable[[FrameType, str, Any], Any] | None]
+TraceFunction: TypeAlias = Callable[[FrameType, str, Any], TraceFunction | None]
diff --git a/mypy/typeshed/stdlib/abc.pyi b/mypy/typeshed/stdlib/abc.pyi
@@ -18,8 +18,8 @@ class ABCMeta(type):
  else:
  def __new__(mcls: type[Self], name: str, bases: tuple[type, ...], namespace: dict[str, Any], **kwargs: Any) -> Self: ...
 
- def __instancecheck__(cls: ABCMeta, instance: Any) -> Any: ...
- def __subclasscheck__(cls: ABCMeta, subclass: Any) -> Any: ...
+ def __instancecheck__(cls: ABCMeta, instance: Any) -> bool: ...
+ def __subclasscheck__(cls: ABCMeta, subclass: type) -> bool: ...
  def _dump_registry(cls: ABCMeta, file: SupportsWrite[str] | None = ...) -> None: ...
  def register(cls: ABCMeta, subclass: type[_T]) -> type[_T]: ...
 

diff --git a/mypy/typeshed/stdlib/asyncio/base_events.pyi b/mypy/typeshed/stdlib/asyncio/base_events.pyi
@@ -5,7 +5,7 @@ from asyncio.events import AbstractEventLoop, AbstractServer, Handle, TimerHandl
 from asyncio.futures import Future
 from asyncio.protocols import BaseProtocol
 from asyncio.tasks import Task
-from asyncio.transports import BaseTransport, ReadTransport, SubprocessTransport, WriteTransport
+from asyncio.transports import BaseTransport, DatagramTransport, ReadTransport, SubprocessTransport, Transport, WriteTransport
 from collections.abc import Awaitable, Callable, Coroutine, Generator, Iterable, Sequence
 from contextvars import Context
 from socket import AddressFamily, SocketKind, _Address, _RetAddress, socket
@@ -129,7 +129,7 @@ class BaseEventLoop(AbstractEventLoop):
  ssl_shutdown_timeout: float | None = ...,
  happy_eyeballs_delay: float | None = ...,
  interleave: int | None = ...,
- ) -> tuple[BaseTransport, _ProtocolT]: ...
+ ) -> tuple[Transport, _ProtocolT]: ...
  @overload
  async def create_connection(
  self,
@@ -148,7 +148,7 @@ class BaseEventLoop(AbstractEventLoop):
  ssl_shutdown_timeout: float | None = ...,
  happy_eyeballs_delay: float | None = ...,
  interleave: int | None = ...,
- ) -> tuple[BaseTransport, _ProtocolT]: ...
+ ) -> tuple[Transport, _ProtocolT]: ...
  elif sys.version_info >= (3, 8):
  @overload
  async def create_connection(
@@ -167,7 +167,7 @@ class BaseEventLoop(AbstractEventLoop):
  ssl_handshake_timeout: float | None = ...,
  happy_eyeballs_delay: float | None = ...,
  interleave: int | None = ...,
- ) -> tuple[BaseTransport, _ProtocolT]: ...
+ ) -> tuple[Transport, _ProtocolT]: ...
  @overload
  async def create_connection(
  self,
@@ -185,7 +185,7 @@ class BaseEventLoop(AbstractEventLoop):
  ssl_handshake_timeout: float | None = ...,
  happy_eyeballs_delay: float | None = ...,
  interleave: int | None = ...,
- ) -> tuple[BaseTransport, _ProtocolT]: ...
+ ) -> tuple[Transport, _ProtocolT]: ...
  else:
  @overload
  async def create_connection(
@@ -202,7 +202,7 @@ class BaseEventLoop(AbstractEventLoop):
  local_addr: tuple[str, int] | None = ...,
  server_hostname: str | None = ...,
  ssl_handshake_timeout: float | None = ...,
- ) -> tuple[BaseTransport, _ProtocolT]: ...
+ ) -> tuple[Transport, _ProtocolT]: ...
  @overload
  async def create_connection(
  self,
@@ -218,7 +218,7 @@ class BaseEventLoop(AbstractEventLoop):
  local_addr: None = ...,
  server_hostname: str | None = ...,
  ssl_handshake_timeout: float | None = ...,
- ) -> tuple[BaseTransport, _ProtocolT]: ...
+ ) -> tuple[Transport, _ProtocolT]: ...
  if sys.version_info >= (3, 11):
  @overload
  async def create_server(
@@ -266,7 +266,7 @@ class BaseEventLoop(AbstractEventLoop):
  server_hostname: str | None = ...,
  ssl_handshake_timeout: float | None = ...,
  ssl_shutdown_timeout: float | None = ...,
- ) -> BaseTransport: ...
+ ) -> Transport: ...
  async def connect_accepted_socket(
  self,
  protocol_factory: Callable[[], _ProtocolT],
@@ -275,7 +275,7 @@ class BaseEventLoop(AbstractEventLoop):
  ssl: _SSLContext = ...,
  ssl_handshake_timeout: float | None = ...,
  ssl_shutdown_timeout: float | None = ...,
- ) -> tuple[BaseTransport, _ProtocolT]: ...
+ ) -> tuple[Transport, _ProtocolT]: ...
  else:
  @overload
  async def create_server(
@@ -320,21 +320,21 @@ class BaseEventLoop(AbstractEventLoop):
  server_side: bool = ...,
  server_hostname: str | None = ...,
  ssl_handshake_timeout: float | None = ...,
- ) -> BaseTransport: ...
+ ) -> Transport: ...
  async def connect_accepted_socket(
  self,
  protocol_factory: Callable[[], _ProtocolT],
  sock: socket,
  *,
  ssl: _SSLContext = ...,
  ssl_handshake_timeout: float | None = ...,
- ) -> tuple[BaseTransport, _ProtocolT]: ...
+ ) -> tuple[Transport, _ProtocolT]: ...
 
  async def sock_sendfile(
  self, sock: socket, file: IO[bytes], offset: int = ..., count: int | None = ..., *, fallback: bool | None = ...
  ) -> int: ...
  async def sendfile(
- self, transport: BaseTransport, file: IO[bytes], offset: int = ..., count: int | None = ..., *, fallback: bool = ...
+ self, transport: WriteTransport, file: IO[bytes], offset: int = ..., count: int | None = ..., *, fallback: bool = ...
  ) -> int: ...
  if sys.version_info >= (3, 11):
  async def create_datagram_endpoint( # type: ignore[override]
@@ -349,7 +349,7 @@ class BaseEventLoop(AbstractEventLoop):
  reuse_port: bool | None = ...,
  allow_broadcast: bool | None = ...,
  sock: socket | None = ...,
- ) -> tuple[BaseTransport, _ProtocolT]: ...
+ ) -> tuple[DatagramTransport, _ProtocolT]: ...
  else:
  async def create_datagram_endpoint(
  self,
@@ -364,7 +364,7 @@ class BaseEventLoop(AbstractEventLoop):
  reuse_port: bool | None = ...,
  allow_broadcast: bool | None = ...,
  sock: socket | None = ...,
- ) -> tuple[BaseTransport, _ProtocolT]: ...
+ ) -> tuple[DatagramTransport, _ProtocolT]: ...
  # Pipes and subprocesses.
  async def connect_read_pipe(
  self, protocol_factory: Callable[[], _ProtocolT], pipe: Any

diff --git a/mypy/typeshed/stdlib/asyncio/events.pyi b/mypy/typeshed/stdlib/asyncio/events.pyi
@@ -12,7 +12,7 @@ from .base_events import Server
 from .futures import Future
 from .protocols import BaseProtocol
 from .tasks import Task
-from .transports import BaseTransport, ReadTransport, SubprocessTransport, WriteTransport
+from .transports import BaseTransport, DatagramTransport, ReadTransport, SubprocessTransport, Transport, WriteTransport
 from .unix_events import AbstractChildWatcher
 
 if sys.version_info >= (3, 8):
@@ -223,7 +223,7 @@ class AbstractEventLoop:
  ssl_shutdown_timeout: float | None = ...,
  happy_eyeballs_delay: float | None = ...,
  interleave: int | None = ...,
- ) -> tuple[BaseTransport, _ProtocolT]: ...
+ ) -> tuple[Transport, _ProtocolT]: ...
  @overload
  @abstractmethod
  async def create_connection(
@@ -243,7 +243,7 @@ class AbstractEventLoop:
  ssl_shutdown_timeout: float | None = ...,
  happy_eyeballs_delay: float | None = ...,
  interleave: int | None = ...,
- ) -> tuple[BaseTransport, _ProtocolT]: ...
+ ) -> tuple[Transport, _ProtocolT]: ...
  elif sys.version_info >= (3, 8):
  @overload
  @abstractmethod
@@ -263,7 +263,7 @@ class AbstractEventLoop:
  ssl_handshake_timeout: float | None = ...,
  happy_eyeballs_delay: float | None = ...,
  interleave: int | None = ...,
- ) -> tuple[BaseTransport, _ProtocolT]: ...
+ ) -> tuple[Transport, _ProtocolT]: ...
  @overload
  @abstractmethod
  async def create_connection(
@@ -282,7 +282,7 @@ class AbstractEventLoop:
  ssl_handshake_timeout: float | None = ...,
  happy_eyeballs_delay: float | None = ...,
  interleave: int | None = ...,
- ) -> tuple[BaseTransport, _ProtocolT]: ...
+ ) -> tuple[Transport, _ProtocolT]: ...
  else:
  @overload
  @abstractmethod
@@ -300,7 +300,7 @@ class AbstractEventLoop:
  local_addr: tuple[str, int] | None = ...,
  server_hostname: str | None = ...,
  ssl_handshake_timeout: float | None = ...,
- ) -> tuple[BaseTransport, _ProtocolT]: ...
+ ) -> tuple[Transport, _ProtocolT]: ...
  @overload
  @abstractmethod
  async def create_connection(
@@ -317,7 +317,7 @@ class AbstractEventLoop:
  local_addr: None = ...,
  server_hostname: str | None = ...,
  ssl_handshake_timeout: float | None = ...,
- ) -> tuple[BaseTransport, _ProtocolT]: ...
+ ) -> tuple[Transport, _ProtocolT]: ...
  if sys.version_info >= (3, 11):
  @overload
  @abstractmethod
@@ -360,15 +360,15 @@ class AbstractEventLoop:
  @abstractmethod
  async def start_tls(
  self,
- transport: BaseTransport,
+ transport: WriteTransport,
  protocol: BaseProtocol,
  sslcontext: ssl.SSLContext,
  *,
  server_side: bool = ...,
  server_hostname: str | None = ...,
  ssl_handshake_timeout: float | None = ...,
  ssl_shutdown_timeout: float | None = ...,
- ) -> BaseTransport: ...
+ ) -> Transport: ...
  async def create_unix_server(
  self,
  protocol_factory: _ProtocolFactory,
@@ -428,7 +428,7 @@ class AbstractEventLoop:
  server_side: bool = ...,
  server_hostname: str | None = ...,
  ssl_handshake_timeout: float | None = ...,
- ) -> BaseTransport: ...
+ ) -> Transport: ...
  async def create_unix_server(
  self,
  protocol_factory: _ProtocolFactory,
@@ -449,7 +449,7 @@ class AbstractEventLoop:
  ssl: _SSLContext = ...,
  ssl_handshake_timeout: float | None = ...,
  ssl_shutdown_timeout: float | None = ...,
- ) -> tuple[BaseTransport, _ProtocolT]: ...
+ ) -> tuple[Transport, _ProtocolT]: ...
  elif sys.version_info >= (3, 10):
  async def connect_accepted_socket(
  self,
@@ -458,7 +458,7 @@ class AbstractEventLoop:
  *,
  ssl: _SSLContext = ...,
  ssl_handshake_timeout: float | None = ...,
- ) -> tuple[BaseTransport, _ProtocolT]: ...
+ ) -> tuple[Transport, _ProtocolT]: ...
  if sys.version_info >= (3, 11):
  async def create_unix_connection(
  self,
@@ -470,7 +470,7 @@ class AbstractEventLoop:
  server_hostname: str | None = ...,
  ssl_handshake_timeout: float | None = ...,
  ssl_shutdown_timeout: float | None = ...,
- ) -> tuple[BaseTransport, _ProtocolT]: ...
+ ) -> tuple[Transport, _ProtocolT]: ...
  else:
  async def create_unix_connection(
  self,
@@ -481,15 +481,15 @@ class AbstractEventLoop:
  sock: socket | None = ...,
  server_hostname: str | None = ...,
  ssl_handshake_timeout: float | None = ...,
- ) -> tuple[BaseTransport, _ProtocolT]: ...
+ ) -> tuple[Transport, _ProtocolT]: ...
 
  @abstractmethod
  async def sock_sendfile(
  self, sock: socket, file: IO[bytes], offset: int = ..., count: int | None = ..., *, fallback: bool | None = ...
  ) -> int: ...
  @abstractmethod
  async def sendfile(
- self, transport: BaseTransport, file: IO[bytes], offset: int = ..., count: int | None = ..., *, fallback: bool = ...
+ self, transport: WriteTransport, file: IO[bytes], offset: int = ..., count: int | None = ..., *, fallback: bool = ...
  ) -> int: ...
  @abstractmethod
  async def create_datagram_endpoint(
@@ -505,7 +505,7 @@ class AbstractEventLoop:
  reuse_port: bool | None = ...,
  allow_broadcast: bool | None = ...,
  sock: socket | None = ...,
- ) -> tuple[BaseTransport, _ProtocolT]: ...
+ ) -> tuple[DatagramTransport, _ProtocolT]: ...
  # Pipes and subprocesses.
  @abstractmethod
  async def connect_read_pipe(