[Python-checkins] cpython (3.4): asyncio doc: clarify how servers create protocol instances

[victor.stinner]

https://hg.python.org/cpython/rev/305f2a6d6c92
changeset:   92986:305f2a6d6c92
branch:      3.4
parent:      92984:5443dee24548
user:        Victor Stinner <victor.stinner at gmail.com>
date:        Sun Oct 12 11:30:17 2014 +0200
summary:
  asyncio doc: clarify how servers create protocol instances

files:
  Doc/library/asyncio-protocol.rst |  14 ++++++++------
  1 files changed, 8 insertions(+), 6 deletions(-)


diff --git a/Doc/library/asyncio-protocol.rst b/Doc/library/asyncio-protocol.rst
--- a/Doc/library/asyncio-protocol.rst
+++ b/Doc/library/asyncio-protocol.rst
@@ -446,7 +446,7 @@
 
     import asyncio
 
-    class EchoClient(asyncio.Protocol):
+    class EchoClientProtocol(asyncio.Protocol):
         message = 'This is the message. It will be echoed.'
 
         def connection_made(self, transport):
@@ -461,7 +461,7 @@
             asyncio.get_event_loop().stop()
 
     loop = asyncio.get_event_loop()
-    coro = loop.create_connection(EchoClient, '127.0.0.1', 8888)
+    coro = loop.create_connection(EchoClientProtocol, '127.0.0.1', 8888)
     loop.run_until_complete(coro)
     loop.run_forever()
     loop.close()
@@ -481,7 +481,7 @@
 
     import asyncio
 
-    class EchoServer(asyncio.Protocol):
+    class EchoServerClientProtocol(asyncio.Protocol):
         def connection_made(self, transport):
             peername = transport.get_extra_info('peername')
             print('Connection from {}'.format(peername))
@@ -498,7 +498,8 @@
             self.transport.close()
 
     loop = asyncio.get_event_loop()
-    coro = loop.create_server(EchoServer, '127.0.0.1', 8888)
+    # Each client connection will create a new protocol instance
+    coro = loop.create_server(EchoServerClientProtocol, '127.0.0.1', 8888)
     server = loop.run_until_complete(coro)
 
     # Server requests until CTRL+c is pressed
@@ -575,7 +576,7 @@
 
     import asyncio
 
-    class EchoServerClientProtocol:
+    class EchoServerProtocol:
         def connection_made(self, transport):
             self.transport = transport
 
@@ -587,8 +588,9 @@
 
     loop = asyncio.get_event_loop()
     print("Starting UDP server")
+    # One protocol instance will be created to serve all client requests
     listen = loop.create_datagram_endpoint(
-        EchoServerClientProtocol, local_addr=('127.0.0.1', 9999))
+        EchoServerProtocol, local_addr=('127.0.0.1', 9999))
     transport, protocol = loop.run_until_complete(listen)
 
     try:

-- 
Repository URL: https://hg.python.org/cpython