From e3ef4d7f653976ac0ccacc4e3fde06bf0e0f139b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alex=20Gr=C3=B6nholm?= Date: Thu, 26 Nov 2020 12:09:12 +0200 Subject: [PATCH] bpo-41332: Added missing connect_accepted_socket() to AbstractEventLoop (GH-21533) Co-authored-by: Andrew Svetlov Co-authored-by: Kyle Stanley --- Lib/asyncio/base_events.py | 8 -------- Lib/asyncio/events.py | 14 ++++++++++++++ .../2020-07-18-17-39-28.bpo-41332.QRGmA5.rst | 2 ++ 3 files changed, 16 insertions(+), 8 deletions(-) create mode 100644 Misc/NEWS.d/next/Library/2020-07-18-17-39-28.bpo-41332.QRGmA5.rst diff --git a/Lib/asyncio/base_events.py b/Lib/asyncio/base_events.py index b2d446a51fe..d71d6f72bf3 100644 --- a/Lib/asyncio/base_events.py +++ b/Lib/asyncio/base_events.py @@ -1525,14 +1525,6 @@ class BaseEventLoop(events.AbstractEventLoop): self, protocol_factory, sock, *, ssl=None, ssl_handshake_timeout=None): - """Handle an accepted connection. - - This is used by servers that accept connections outside of - asyncio but that use asyncio to handle connections. - - This method is a coroutine. When completed, the coroutine - returns a (transport, protocol) pair. - """ if sock.type != socket.SOCK_STREAM: raise ValueError(f'A Stream Socket was expected, got {sock!r}') diff --git a/Lib/asyncio/events.py b/Lib/asyncio/events.py index 0dce87b8ecc..1a20f362ec3 100644 --- a/Lib/asyncio/events.py +++ b/Lib/asyncio/events.py @@ -418,6 +418,20 @@ class AbstractEventLoop: """ raise NotImplementedError + async def connect_accepted_socket( + self, protocol_factory, sock, + *, ssl=None, + ssl_handshake_timeout=None): + """Handle an accepted connection. + + This is used by servers that accept connections outside of + asyncio, but use asyncio to handle connections. + + This method is a coroutine. When completed, the coroutine + returns a (transport, protocol) pair. + """ + raise NotImplementedError + async def create_datagram_endpoint(self, protocol_factory, local_addr=None, remote_addr=None, *, family=0, proto=0, flags=0, diff --git a/Misc/NEWS.d/next/Library/2020-07-18-17-39-28.bpo-41332.QRGmA5.rst b/Misc/NEWS.d/next/Library/2020-07-18-17-39-28.bpo-41332.QRGmA5.rst new file mode 100644 index 00000000000..fa3fb83b9f5 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2020-07-18-17-39-28.bpo-41332.QRGmA5.rst @@ -0,0 +1,2 @@ +Added missing connect_accepted_socket() method to +``asyncio.AbstractEventLoop``.