[Python-checkins] bpo-38192: Fix remaining passing of "loop" in the protocol examples (GH-16202)

Tue Sep 17 03:22:52 EDT 2019

https://github.com/python/cpython/commit/facbd316b409f3775da2a74d0845938b4c7b88f0
commit: facbd316b409f3775da2a74d0845938b4c7b88f0
branch: 3.7
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2019年09月17日T00:22:48-07:00
summary:
bpo-38192: Fix remaining passing of "loop" in the protocol examples (GH-16202)
See https://bugs.python.org/issue38192 .
https://bugs.python.org/issue38192
(cherry picked from commit 5d359cc62e0244e1fd8d17146a4135079d6843bf)
Co-authored-by: Hrvoje Nikšić <hniksic at gmail.com>
files:
M Doc/library/asyncio-protocol.rst

diff --git a/Doc/library/asyncio-protocol.rst b/Doc/library/asyncio-protocol.rst
index d421905f0f32..1a7794e21261 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())
