From c47dacb69054f6fe1c2465df585985430f7fe366 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Melero=20Fern=C3=A1ndez?= Date: Thu, 25 Jan 2018 23:45:43 +0000 Subject: bpo-32574: Fix leaks in asyncio.Queue.put() and .get() (#5208) --- Lib/asyncio/queues.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'Lib/asyncio') diff --git a/Lib/asyncio/queues.py b/Lib/asyncio/queues.py index 512ea6037f..2a8d3e7604 100644 --- a/Lib/asyncio/queues.py +++ b/Lib/asyncio/queues.py @@ -121,6 +121,13 @@ class Queue: await putter except: putter.cancel() # Just in case putter is not done yet. + try: + # Clean self._putters from canceled putters. + self._putters.remove(putter) + except ValueError: + # The putter could be removed from self._putters by a + # previous get_nowait call. + pass if not self.full() and not putter.cancelled(): # We were woken up by get_nowait(), but can't take # the call. Wake up the next in line. @@ -152,12 +159,13 @@ class Queue: await getter except: getter.cancel() # Just in case getter is not done yet. - try: + # Clean self._getters from canceled getters. self._getters.remove(getter) except ValueError: + # The getter could be removed from self._getters by a + # previous put_nowait call. pass - if not self.empty() and not getter.cancelled(): # We were woken up by put_nowait(), but can't take # the call. Wake up the next in line. -- cgit v1.2.1