From 1ba74719e3a213a2c473b92f3a79f8399e65f80a Mon Sep 17 00:00:00 2001 From: "Miss Islington (bot)" <31488909+miss-islington@users.noreply.github.com> Date: Tue, 17 Sep 2019 00:24:31 -0700 Subject: [PATCH] bpo-38192: Fix remaining passing of "loop" in the protocol examples (GH-16202) MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit See https://bugs.python.org/issue38192 . https://bugs.python.org/issue38192 (cherry picked from commit 5d359cc62e0244e1fd8d17146a4135079d6843bf) Co-authored-by: Hrvoje Nikšić --- Doc/library/asyncio-protocol.rst | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Doc/library/asyncio-protocol.rst b/Doc/library/asyncio-protocol.rst index ca37581c28..cb0317ea20 100644 --- a/Doc/library/asyncio-protocol.rst +++ b/Doc/library/asyncio-protocol.rst @@ -792,7 +792,7 @@ data, and waits until the connection is closed:: message = 'Hello World!' transport, protocol = await loop.create_connection( - lambda: EchoClientProtocol(message, on_con_lost, loop), + lambda: EchoClientProtocol(message, on_con_lost), '127.0.0.1', 8888) # Wait until the protocol signals that the connection @@ -870,8 +870,8 @@ method, sends data and closes the transport when it receives the answer:: class EchoClientProtocol: def __init__(self, message, on_con_lost): self.message = message - self.transport = None self.on_con_lost = on_con_lost + self.transport = None def connection_made(self, transport): self.transport = transport @@ -927,9 +927,9 @@ Wait until a socket receives data using the class MyProtocol(asyncio.Protocol): - def __init__(self, loop): + def __init__(self, on_con_lost): self.transport = None - self.on_con_lost = loop.create_future() + self.on_con_lost = on_con_lost def connection_made(self, transport): self.transport = transport @@ -950,13 +950,14 @@ Wait until a socket receives data using the # Get a reference to the event loop as we plan to use # low-level APIs. loop = asyncio.get_running_loop() + on_con_lost = loop.create_future() # Create a pair of connected sockets rsock, wsock = socket.socketpair() # Register the socket to wait for data. transport, protocol = await loop.create_connection( - lambda: MyProtocol(loop), sock=rsock) + lambda: MyProtocol(on_con_lost), sock=rsock) # Simulate the reception of data from the network. loop.call_soon(wsock.send, 'abc'.encode()) -- 2.50.0