Always allow getters to re-check queue empty

EpicWink · EpicWink · commit ddc6ad60276a · 2024-03-28T15:55:30.000+10:00
diff --git a/Lib/asyncio/queues.py b/Lib/asyncio/queues.py
@@ -272,10 +272,10 @@ def shutdown(self, immediate=False):
                     self._unfinished_tasks -= 1
             if self._unfinished_tasks <= 0:
                 self._finished.set()
-            while self._getters:
-                getter = self._getters.popleft()
-                if not getter.done():
-                    getter.set_result(None)
+        while self._getters:
+            getter = self._getters.popleft()
+            if not getter.done():
+                getter.set_result(None)
         while self._putters:
             putter = self._putters.popleft()
             if not putter.done():
diff --git a/Lib/test/test_asyncio/test_queues.py b/Lib/test/test_asyncio/test_queues.py
@@ -551,10 +551,12 @@ async def test_format(self):
     async def test_shutdown_empty(self):
         # Test shutting down an empty queue
 
-        # Setup empty queue and join() task
+        # Setup empty queue, and join() and get() tasks
         q = self.q_class()
         loop = asyncio.get_running_loop()
         join_task = loop.create_task(q.join())
+        get_task = loop.create_task(q.get())
+        await self._ensure_started(get_task)  # want pending before shutdown
 
         # Perform shut-down
         q.shutdown(immediate=False)  # unfinished tasks: 0 -> 0
@@ -566,6 +568,11 @@ async def test_shutdown_empty(self):
         self.assertTrue(join_task.done())
         await join_task
 
+        # Ensure get() task is finished, and raised ShutDown
+        self.assertTrue(get_task.done())
+        with self.assertRaisesShutdown():
+            await get_task
+
         # Ensure put() and get() raise ShutDown
         with self.assertRaisesShutdown():
             await q.put("data")
