Sync typeshed (#15873)

Source commit: python/typeshed@74aac1a

Author: github-actions[bot]

mypy/typeshed/stdlib/asyncio/base_events.pyi

@@ -107,7 +107,48 @@ class BaseEventLoop(AbstractEventLoop):
  flags: int = 0,
  ) -> list[tuple[AddressFamily, SocketKind, int, str, tuple[str, int] | tuple[str, int, int, int]]]: ...
  async def getnameinfo(self, sockaddr: tuple[str, int] | tuple[str, int, int, int], flags: int = 0) -> tuple[str, str]: ...
- if sys.version_info >= (3, 11):
+ if sys.version_info >= (3, 12):
+ @overload
+ async def create_connection(
+ self,
+ protocol_factory: Callable[[], _ProtocolT],
+ host: str = ...,
+ port: int = ...,
+ *,
+ ssl: _SSLContext = None,
+ family: int = 0,
+ proto: int = 0,
+ flags: int = 0,
+ sock: None = None,
+ local_addr: tuple[str, int] | None = None,
+ server_hostname: str | None = None,
+ ssl_handshake_timeout: float | None = None,
+ ssl_shutdown_timeout: float | None = None,
+ happy_eyeballs_delay: float | None = None,
+ interleave: int | None = None,
+ all_errors: bool = False,
+ ) -> tuple[Transport, _ProtocolT]: ...
+ @overload
+ async def create_connection(
+ self,
+ protocol_factory: Callable[[], _ProtocolT],
+ host: None = None,
+ port: None = None,
+ *,
+ ssl: _SSLContext = None,
+ family: int = 0,
+ proto: int = 0,
+ flags: int = 0,
+ sock: socket,
+ local_addr: None = None,
+ server_hostname: str | None = None,
+ ssl_handshake_timeout: float | None = None,
+ ssl_shutdown_timeout: float | None = None,
+ happy_eyeballs_delay: float | None = None,
+ interleave: int | None = None,
+ all_errors: bool = False,
+ ) -> tuple[Transport, _ProtocolT]: ...
+ elif sys.version_info >= (3, 11):
  @overload
  async def create_connection(
  self,
@@ -426,5 +467,7 @@ class BaseEventLoop(AbstractEventLoop):
  # Debug flag management.
  def get_debug(self) -> bool: ...
  def set_debug(self, enabled: bool) -> None: ...
- if sys.version_info >= (3, 9):
+ if sys.version_info >= (3, 12):
+ async def shutdown_default_executor(self, timeout: float | None = None) -> None: ...
+ elif sys.version_info >= (3, 9):
  async def shutdown_default_executor(self) -> None: ...

mypy/typeshed/stdlib/asyncio/constants.pyi

@@ -11,6 +11,8 @@ if sys.version_info >= (3, 11):
  SSL_SHUTDOWN_TIMEOUT: float
  FLOW_CONTROL_HIGH_WATER_SSL_READ: Literal[256]
  FLOW_CONTROL_HIGH_WATER_SSL_WRITE: Literal[512]
+if sys.version_info >= (3, 12):
+ THREAD_JOIN_TIMEOUT: Literal[300]
 
 class _SendfileMode(enum.Enum):
  UNSUPPORTED: int

mypy/typeshed/stdlib/asyncio/events.pyi

@@ -76,6 +76,8 @@ class Handle:
  def cancel(self) -> None: ...
  def _run(self) -> None: ...
  def cancelled(self) -> bool: ...
+ if sys.version_info >= (3, 12):
+ def get_context(self) -> Context: ...
 
 class TimerHandle(Handle):
  def __init__(

mypy/typeshed/stdlib/asyncio/streams.pyi

@@ -148,7 +148,16 @@ class StreamWriter:
  async def wait_closed(self) -> None: ...
  def get_extra_info(self, name: str, default: Any = None) -> Any: ...
  async def drain(self) -> None: ...
- if sys.version_info >= (3, 11):
+ if sys.version_info >= (3, 12):
+ async def start_tls(
+ self,
+ sslcontext: ssl.SSLContext,
+ *,
+ server_hostname: str | None = None,
+ ssl_handshake_timeout: float | None = None,
+ ssl_shutdown_timeout: float | None = None,
+ ) -> None: ...
+ elif sys.version_info >= (3, 11):
  async def start_tls(
  self, sslcontext: ssl.SSLContext, *, server_hostname: str | None = None, ssl_handshake_timeout: float | None = None
  ) -> None: ...

mypy/typeshed/stdlib/asyncio/tasks.pyi

@@ -285,7 +285,26 @@ else:
 # since the only reason why `asyncio.Future` is invariant is the `set_result()` method,
 # and `asyncio.Task.set_result()` always raises.
 class Task(Future[_T_co], Generic[_T_co]): # type: ignore[type-var] # pyright: ignore[reportGeneralTypeIssues]
- if sys.version_info >= (3, 8):
+ if sys.version_info >= (3, 12):
+ def __init__(
+ self,
+ coro: _TaskCompatibleCoro[_T_co],
+ *,
+ loop: AbstractEventLoop = ...,
+ name: str | None,
+ context: Context | None = None,
+ eager_start: bool = False,
+ ) -> None: ...
+ elif sys.version_info >= (3, 11):
+ def __init__(
+ self,
+ coro: _TaskCompatibleCoro[_T_co],
+ *,
+ loop: AbstractEventLoop = ...,
+ name: str | None,
+ context: Context | None = None,
+ ) -> None: ...
+ elif sys.version_info >= (3, 8):
  def __init__(
  self, coro: _TaskCompatibleCoro[_T_co], *, loop: AbstractEventLoop = ..., name: str | None = ...
  ) -> None: ...
@@ -295,6 +314,8 @@ class Task(Future[_T_co], Generic[_T_co]): # type: ignore[type-var] # pyright:
  def get_coro(self) -> _TaskCompatibleCoro[_T_co]: ...
  def get_name(self) -> str: ...
  def set_name(self, __value: object) -> None: ...
+ if sys.version_info >= (3, 12):
+ def get_context(self) -> Context: ...
 
  def get_stack(self, *, limit: int | None = None) -> list[FrameType]: ...
  def print_stack(self, *, limit: int | None = None, file: TextIO | None = None) -> None: ...

mypy/typeshed/stdlib/enum.pyi

@@ -2,7 +2,6 @@ import _typeshed
 import sys
 import types
 from _typeshed import SupportsKeysAndGetItem, Unused
-from abc import ABCMeta
 from builtins import property as _builtins_property
 from collections.abc import Callable, Iterable, Iterator, Mapping
 from typing import Any, Generic, TypeVar, overload
@@ -76,12 +75,8 @@ class _EnumDict(dict[str, Any]):
  @overload
  def update(self, members: Iterable[tuple[str, Any]], **more_members: Any) -> None: ...
 
-# Note: EnumMeta actually subclasses type directly, not ABCMeta.
-# This is a temporary workaround to allow multiple creation of enums with builtins
-# such as str as mixins, which due to the handling of ABCs of builtin types, cause
-# spurious inconsistent metaclass structure. See #1595.
 # Structurally: Iterable[T], Reversible[T], Container[T] where T is the enum itself
-class EnumMeta(ABCMeta):
+class EnumMeta(type):
  if sys.version_info >= (3, 11):
  def __new__(
  metacls: type[_typeshed.Self],
@@ -193,6 +188,9 @@ class Enum(metaclass=EnumMeta):
  def __hash__(self) -> int: ...
  def __format__(self, format_spec: str) -> str: ...
  def __reduce_ex__(self, proto: Unused) -> tuple[Any, ...]: ...
+ if sys.version_info >= (3, 12):
+ def __copy__(self) -> Self: ...
+ def __deepcopy__(self, memo: Any) -> Self: ...
 
 if sys.version_info >= (3, 11):
  class ReprEnum(Enum): ...

mypy/typeshed/stdlib/importlib/metadata/__init__.pyi

@@ -180,6 +180,7 @@ class MetadataPathFinder(DistributionFinder):
  def invalidate_caches(cls) -> None: ...
 
 class PathDistribution(Distribution):
+ _path: Path
  def __init__(self, path: Path) -> None: ...
  def read_text(self, filename: StrPath) -> str: ...
  def locate_file(self, path: StrPath) -> PathLike[str]: ...

mypy/typeshed/stdlib/logging/__init__.pyi

@@ -60,6 +60,8 @@ __all__ = [
 
 if sys.version_info >= (3, 11):
  __all__ += ["getLevelNamesMapping"]
+if sys.version_info >= (3, 12):
+ __all__ += ["getHandlerByName", "getHandlerNames"]
 
 _SysExcInfoType: TypeAlias = tuple[type[BaseException], BaseException, TracebackType | None] | tuple[None, None, None]
 _ExcInfoType: TypeAlias = None | bool | _SysExcInfoType | BaseException
@@ -83,7 +85,10 @@ class Filterer:
  filters: list[_FilterType]
  def addFilter(self, filter: _FilterType) -> None: ...
  def removeFilter(self, filter: _FilterType) -> None: ...
- def filter(self, record: LogRecord) -> bool: ...
+ if sys.version_info >= (3, 12):
+ def filter(self, record: LogRecord) -> bool | LogRecord: ...
+ else:
+ def filter(self, record: LogRecord) -> bool: ...
 
 class Manager: # undocumented
  root: RootLogger
@@ -111,6 +116,8 @@ class Logger(Filterer):
  def isEnabledFor(self, level: int) -> bool: ...
  def getEffectiveLevel(self) -> int: ...
  def getChild(self, suffix: str) -> Self: ... # see python/typing#980
+ if sys.version_info >= (3, 12):
+ def getChildren(self) -> set[Logger]: ...
  if sys.version_info >= (3, 8):
  def debug(
  self,
@@ -324,6 +331,10 @@ class Handler(Filterer):
  def format(self, record: LogRecord) -> str: ...
  def emit(self, record: LogRecord) -> None: ...
 
+if sys.version_info >= (3, 12):
+ def getHandlerByName(name: str) -> Handler | None: ...
+ def getHandlerNames() -> frozenset[str]: ...
+
 class Formatter:
  converter: Callable[[float | None], struct_time]
  _fmt: str | None # undocumented
@@ -370,7 +381,10 @@ class Filter:
  name: str # undocumented
  nlen: int # undocumented
  def __init__(self, name: str = "") -> None: ...
- def filter(self, record: LogRecord) -> bool: ...
+ if sys.version_info >= (3, 12):
+ def filter(self, record: LogRecord) -> bool | LogRecord: ...
+ else:
+ def filter(self, record: LogRecord) -> bool: ...
 
 class LogRecord:
  # args can be set to None by logging.handlers.QueueHandler

mypy/typeshed/stdlib/socket.pyi

@@ -201,6 +201,7 @@ if sys.platform != "win32" and sys.platform != "darwin":
  TCP_LINGER2 as TCP_LINGER2,
  TCP_QUICKACK as TCP_QUICKACK,
  TCP_SYNCNT as TCP_SYNCNT,
+ TCP_USER_TIMEOUT as TCP_USER_TIMEOUT,
  TCP_WINDOW_CLAMP as TCP_WINDOW_CLAMP,
  )
 if sys.platform != "win32":

mypy/typeshed/stdlib/sre_parse.pyi

@@ -87,25 +87,39 @@ class Tokenizer:
  def seek(self, index: int) -> None: ...
  def error(self, msg: str, offset: int = 0) -> _Error: ...
 
- if sys.version_info >= (3, 11):
+ if sys.version_info >= (3, 12):
+ def checkgroupname(self, name: str, offset: int) -> None: ...
+ elif sys.version_info >= (3, 11):
  def checkgroupname(self, name: str, offset: int, nested: int) -> None: ...
 
 def fix_flags(src: str | bytes, flags: int) -> int: ...
 
 _TemplateType: TypeAlias = tuple[list[tuple[int, int]], list[str | None]]
 _TemplateByteType: TypeAlias = tuple[list[tuple[int, int]], list[bytes | None]]
-if sys.version_info >= (3, 8):
- def parse(str: str, flags: int = 0, state: State | None = None) -> SubPattern: ...
+
+if sys.version_info >= (3, 12):
+ @overload
+ def parse_template(source: str, pattern: _Pattern[Any]) -> _TemplateType: ...
+ @overload
+ def parse_template(source: bytes, pattern: _Pattern[Any]) -> _TemplateByteType: ...
+
+elif sys.version_info >= (3, 8):
  @overload
  def parse_template(source: str, state: _Pattern[Any]) -> _TemplateType: ...
  @overload
  def parse_template(source: bytes, state: _Pattern[Any]) -> _TemplateByteType: ...
 
 else:
- def parse(str: str, flags: int = 0, pattern: Pattern | None = None) -> SubPattern: ...
  @overload
  def parse_template(source: str, pattern: _Pattern[Any]) -> _TemplateType: ...
  @overload
  def parse_template(source: bytes, pattern: _Pattern[Any]) -> _TemplateByteType: ...
 
-def expand_template(template: _TemplateType, match: Match[Any]) -> str: ...
+if sys.version_info >= (3, 8):
+ def parse(str: str, flags: int = 0, state: State | None = None) -> SubPattern: ...
+
+else:
+ def parse(str: str, flags: int = 0, pattern: Pattern | None = None) -> SubPattern: ...
+
+if sys.version_info < (3, 12):
+ def expand_template(template: _TemplateType, match: Match[Any]) -> str: ...