Fix asyncio issue 235: Queue subclass bug caused by JoinableQueue merge.
diff --git a/Lib/asyncio/queues.py b/Lib/asyncio/queues.py
index 84cdabc..ed11662 100644
--- a/Lib/asyncio/queues.py
+++ b/Lib/asyncio/queues.py
@@ -54,6 +54,8 @@
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 _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 @@
'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 @@
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 @@
'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 @@
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 @@
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 @@
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