Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-31 13:41:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix asyncio issue 235: Queue subclass bug caused by JoinableQueue merge.

Browse source
This commit is contained in:
Guido van Rossum 2015-04-20 09:24:24 -07:00
parent 77e8311deb
commit 0bd16bc4cd
3 changed files with 36 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Lib/asyncio/queues.py
View file

@ -54,6 +54,8 @@ def __init__(self, maxsize=0, *, loop=None):
self._finished.set()
self._init(maxsize)
# These three are overridable in subclasses.
def _init(self, maxsize):
self._queue = collections.deque()
@ -62,6 +64,11 @@ def _get(self):
def _put(self, item):
self._queue.append(item)
# End of the overridable methods.
def __put_internal(self, item):
self._put(item)
self._unfinished_tasks += 1
self._finished.clear()
@ -133,7 +140,7 @@ def put(self, item):
'queue non-empty, why are getters waiting?')
getter = self._getters.popleft()
self._put(item)
self.__put_internal(item)
# getter cannot be cancelled, we just removed done getters
getter.set_result(self._get())
@ -145,7 +152,7 @@ def put(self, item):
yield from waiter
else:
self._put(item)
self.__put_internal(item)
def put_nowait(self, item):
"""Put an item into the queue without blocking.
@ -158,7 +165,7 @@ def put_nowait(self, item):
'queue non-empty, why are getters waiting?')
getter = self._getters.popleft()
self._put(item)
self.__put_internal(item)
# getter cannot be cancelled, we just removed done getters
getter.set_result(self._get())
@ -166,7 +173,7 @@ def put_nowait(self, item):
elif self._maxsize > 0 and self._maxsize <= self.qsize():
raise QueueFull
else:
self._put(item)
self.__put_internal(item)
@coroutine
def get(self):
@ -180,7 +187,7 @@ def get(self):
if self._putters:
assert self.full(), 'queue not full, why are putters waiting?'
item, putter = self._putters.popleft()
self._put(item)
self.__put_internal(item)
# When a getter runs and frees up a slot so this putter can
# run, we need to defer the put for a tick to ensure that
@ -207,7 +214,7 @@ def get_nowait(self):
if self._putters:
assert self.full(), 'queue not full, why are putters waiting?'
item, putter = self._putters.popleft()
self._put(item)
self.__put_internal(item)
# Wake putter on next tick.
# getter cannot be cancelled, we just removed done putters