Further progress - got a CLI chat client working using prompt-toolkit.

python · cjrh · Oct 7, 2018 · Oct 14, 2018 · Oct 21, 2018 · Oct 21, 2018
commit 34306f0ae8e78f0e0360775b8b00d054962c8303
diff --git a/Doc/library/asyncio-tutorial/case-study-chat-server.rst b/Doc/library/asyncio-tutorial/case-study-chat-server.rst
@@ -342,7 +342,7 @@ membership:
 
 .. literalinclude:: server05.py
     :caption: Joining and leaving rooms
-    :lines: 9-10,18-40
+    :lines: 9-10,18-39
     :language: python3
 
 When we receive a request to join

diff --git a/Doc/library/asyncio-tutorial/client05.py b/Doc/library/asyncio-tutorial/client05.py
@@ -0,0 +1,36 @@
+import asyncio
+from utils import new_messages, send_message
+
+from prompt_toolkit.eventloop.defaults import use_asyncio_event_loop
+from prompt_toolkit.patch_stdout import patch_stdout
+from prompt_toolkit.shortcuts import PromptSession
+
+
+async def main():
+    use_asyncio_event_loop()
+
+    reader, writer = await asyncio.open_connection('localhost', '9011')
+    await send_message(writer, dict(action='connect', username='Eric'))
+    await send_message(writer, dict(action='joinroom', room='nonsense'))
+
+    asyncio.create_task(enter_message(writer))
+
+    async for msg in new_messages(reader):
+        print(f"{msg['from']}: {msg['message']}")
+
+
+async def enter_message(writer):
+    session = PromptSession('Send message: ', erase_when_done=True)
+    while True:
+        try:
+            msg = await session.prompt(async_=True)
+            if not msg:
+                continue
+            await send_message(writer, msg)
+        except (EOFError, asyncio.CancelledError):
+            return
+
+
+if __name__ == '__main__':
+    with patch_stdout():
+        asyncio.run(main())
diff --git a/Doc/library/asyncio-tutorial/pttest.py b/Doc/library/asyncio-tutorial/pttest.py
@@ -0,0 +1,32 @@
+import asyncio
+
+from prompt_toolkit.eventloop.defaults import use_asyncio_event_loop
+from prompt_toolkit.patch_stdout import patch_stdout
+from prompt_toolkit.shortcuts import PromptSession
+
+
+async def blah():
+    while True:
+        print('.')
+        await asyncio.sleep(10.0)
+
+
+async def prompt():
+    session = PromptSession('Message: ', erase_when_done=True)
+    while True:
+        try:
+            msg = await session.prompt(async_=True)
+            print(msg)
+        except (EOFError, asyncio.CancelledError):
+            return
+
+
+async def main():
+    use_asyncio_event_loop()
+    await asyncio.gather(blah(), prompt())
+    # await asyncio.gather(blah())
+
+
+if __name__ == '__main__':
+    with patch_stdout():
+        asyncio.run(main())
diff --git a/Doc/library/asyncio-tutorial/server05.py b/Doc/library/asyncio-tutorial/server05.py
@@ -33,10 +33,9 @@ def leaveroom(msg):
 
     def chat(msg):
         print(f'chat sent to room {msg.get("room")}: {msg.get("message")}')
-        payload = json.dumps(msg).encode()
         room = ROOMS[msg["room"]]
         for friend in room:
-            asyncio.create_task(send_message(friend, payload))
+            asyncio.create_task(send_message(friend, msg))
 
     handlers: Dict[str, Callable[[Dict], None]] = dict(
         connect=connect,