Merge remote-tracking branch 'origin/master'

Author: mikeckennedy

src/09-built-on-asyncio/requirements.txt

@@ -1,6 +1,6 @@
 unsync
-trio==0.8.0
-trio_asyncio==0.9.1
+trio==0.16.0
+trio_asyncio==0.11.0
 
 aiohttp
 cchardet

src/09-built-on-asyncio/the_trio/prod_trio.py

@@ -8,32 +8,40 @@ async def main():
     t0 = datetime.datetime.now()
     print(colorama.Fore.WHITE + "App started.", flush=True)
 
-    data = trio.Queue(capacity=10)
+    """
+    trio.Queue was removed in v0.11.0:
+    - Replacing the call to trio.Queue() by trio.open_memory_channel()
+    - Using a MemorySendChannel object in generate_data function
+    - Using a MemoryReceiveChannel object in process_data function
+    - Updating requirements.txt with trio v0.16.0 and trio_asyncio v0.11.0
+    """
+
+    send_channel, receive_channel = trio.open_memory_channel(max_buffer_size=10)
 
     with trio.move_on_after(5):
         async with trio.open_nursery() as nursery:
-            nursery.start_soon(generate_data, 20, data, name='Prod 1')
-            nursery.start_soon(generate_data, 20, data, name='Prod 2')
-            nursery.start_soon(process_data, 40, data, name='Consumer')
+            nursery.start_soon(generate_data, 20, send_channel, name='Prod 1')
+            nursery.start_soon(generate_data, 20, send_channel, name='Prod 2')
+            nursery.start_soon(process_data, 40, receive_channel, name='Consumer')
 
     dt = datetime.datetime.now() - t0
     print(colorama.Fore.WHITE + "App exiting, total time: {:,.2f} sec.".format(
         dt.total_seconds()), flush=True)
 
 
-async def generate_data(num: int, data: trio.Queue):
+async def generate_data(num: int, data: trio.MemorySendChannel):
     for idx in range(1, num + 1):
         item = idx*idx
-        await data.put((item, datetime.datetime.now()))
+        await data.send((item, datetime.datetime.now()))
 
         print(colorama.Fore.YELLOW + f" -- generated item {idx}", flush=True)
         await trio.sleep(random.random() + .5)
 
 
-async def process_data(num: int, data: trio.Queue):
+async def process_data(num: int, data: trio.MemoryReceiveChannel):
     processed = 0
     while processed < num:
-        item = await data.get()
+        item = await data.receive()
 
         processed += 1
         value = item[0]