From 4990da6c60f995fb32af8a0b47e9094898a41a08 Mon Sep 17 00:00:00 2001
From: Nikita Sobolev <mail@sobolevn.me>
Date: Tue, 8 Aug 2023 17:28:36 +0300
Subject: [PATCH] Update `asyncio.base_events` for py312 (#10543)

---
 stdlib/asyncio/base_events.pyi      | 47 +++++++++++++++++++++++++++--
 tests/stubtest_allowlists/py312.txt |  4 ---
 2 files changed, 45 insertions(+), 6 deletions(-)

diff --git a/stdlib/asyncio/base_events.pyi b/stdlib/asyncio/base_events.pyi
index 9924f728f..e2b55da8c 100644
--- a/stdlib/asyncio/base_events.pyi
+++ b/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: ...
diff --git a/tests/stubtest_allowlists/py312.txt b/tests/stubtest_allowlists/py312.txt
index 84bb9c053..a5558fade 100644
--- a/tests/stubtest_allowlists/py312.txt
+++ b/tests/stubtest_allowlists/py312.txt
@@ -1,9 +1,5 @@
 # Uncategorised, from Python 3.12
 argparse.BooleanOptionalAction.__init__
-asyncio.BaseEventLoop.create_connection
-asyncio.BaseEventLoop.shutdown_default_executor
-asyncio.base_events.BaseEventLoop.create_connection
-asyncio.base_events.BaseEventLoop.shutdown_default_executor
 asyncio.create_eager_task_factory
 asyncio.eager_task_factory
 asyncio.tasks.__all__