From 34d3659cd327a91ccfb154531e6b16769a706214 Mon Sep 17 00:00:00 2001 From: Sam Bull Date: Tue, 25 Oct 2022 19:58:58 +0100 Subject: [PATCH] Tidy up asyncio examples. --- docs/examples/asyncio_examples.ipynb | 68 +++++++++++----------------- 1 file changed, 27 insertions(+), 41 deletions(-) diff --git a/docs/examples/asyncio_examples.ipynb b/docs/examples/asyncio_examples.ipynb index 66d435835b..dab7a96ae9 100644 --- a/docs/examples/asyncio_examples.ipynb +++ b/docs/examples/asyncio_examples.ipynb @@ -140,8 +140,6 @@ "source": [ "import asyncio\n", "\n", - "import async_timeout\n", - "\n", "import redis.asyncio as redis\n", "\n", "STOPWORD = \"STOP\"\n", @@ -149,29 +147,24 @@ "\n", "async def reader(channel: redis.client.PubSub):\n", " while True:\n", - " try:\n", - " async with async_timeout.timeout(1):\n", - " message = await channel.get_message(ignore_subscribe_messages=True)\n", - " if message is not None:\n", - " print(f\"(Reader) Message Received: {message}\")\n", - " if message[\"data\"].decode() == STOPWORD:\n", - " print(\"(Reader) STOP\")\n", - " break\n", - " await asyncio.sleep(0.01)\n", - " except asyncio.TimeoutError:\n", - " pass\n", + " message = await channel.get_message(ignore_subscribe_messages=True)\n", + " if message is not None:\n", + " print(f\"(Reader) Message Received: {message}\")\n", + " if message[\"data\"].decode() == STOPWORD:\n", + " print(\"(Reader) STOP\")\n", + " break\n", "\n", "r = redis.from_url(\"redis://localhost\")\n", - "pubsub = r.pubsub()\n", - "await pubsub.subscribe(\"channel:1\", \"channel:2\")\n", + "async with r.pubsub() as pubsub:\n", + " await pubsub.subscribe(\"channel:1\", \"channel:2\")\n", "\n", - "future = asyncio.create_task(reader(pubsub))\n", + " future = asyncio.create_task(reader(pubsub))\n", "\n", - "await r.publish(\"channel:1\", \"Hello\")\n", - "await r.publish(\"channel:2\", \"World\")\n", - "await r.publish(\"channel:1\", STOPWORD)\n", + " await r.publish(\"channel:1\", \"Hello\")\n", + " await r.publish(\"channel:2\", \"World\")\n", + " await r.publish(\"channel:1\", STOPWORD)\n", "\n", - "await future" + " await future" ] }, { @@ -204,8 +197,6 @@ "source": [ "import asyncio\n", "\n", - "import async_timeout\n", - "\n", "import redis.asyncio as redis\n", "\n", "STOPWORD = \"STOP\"\n", @@ -213,30 +204,25 @@ "\n", "async def reader(channel: redis.client.PubSub):\n", " while True:\n", - " try:\n", - " async with async_timeout.timeout(1):\n", - " message = await channel.get_message(ignore_subscribe_messages=True)\n", - " if message is not None:\n", - " print(f\"(Reader) Message Received: {message}\")\n", - " if message[\"data\"].decode() == STOPWORD:\n", - " print(\"(Reader) STOP\")\n", - " break\n", - " await asyncio.sleep(0.01)\n", - " except asyncio.TimeoutError:\n", - " pass\n", + " message = await channel.get_message(ignore_subscribe_messages=True)\n", + " if message is not None:\n", + " print(f\"(Reader) Message Received: {message}\")\n", + " if message[\"data\"].decode() == STOPWORD:\n", + " print(\"(Reader) STOP\")\n", + " break\n", "\n", "\n", "r = await redis.from_url(\"redis://localhost\")\n", - "pubsub = r.pubsub()\n", - "await pubsub.psubscribe(\"channel:*\")\n", + "async with r.pubsub() as pubsub:\n", + " await pubsub.psubscribe(\"channel:*\")\n", "\n", - "future = asyncio.create_task(reader(pubsub))\n", + " future = asyncio.create_task(reader(pubsub))\n", "\n", - "await r.publish(\"channel:1\", \"Hello\")\n", - "await r.publish(\"channel:2\", \"World\")\n", - "await r.publish(\"channel:1\", STOPWORD)\n", + " await r.publish(\"channel:1\", \"Hello\")\n", + " await r.publish(\"channel:2\", \"World\")\n", + " await r.publish(\"channel:1\", STOPWORD)\n", "\n", - "await future" + " await future" ] }, { @@ -298,4 +284,4 @@ }, "nbformat": 4, "nbformat_minor": 1 -} \ No newline at end of file +}