make Queue.queue public

Author: nggit

tremolo/lib/queue.py

@@ -8,11 +8,11 @@
 class Queue:
     def __init__(self, loop=None):
         self._loop = loop or asyncio.get_event_loop()
-        self._queue = deque()
+        self.queue = deque()
         self._getters = deque()
 
     def qsize(self):
-        return len(self._queue)
+        return len(self.queue)
 
     def put_nowait(self, item):
         while self._getters:
@@ -22,34 +22,34 @@ def put_nowait(self, item):
                 fut.set_result(item)
                 return
 
-        self._queue.append(item)
+        self.queue.append(item)
 
     async def get(self, timeout=None):
         if self._getters:
             await self._getters[-1]
 
         try:
-            return self._queue.popleft()
+            return self.queue.popleft()
         except IndexError:
             fut = self._loop.create_future()
             self._getters.append(fut)
 
-            if timeout is None:
-                return await fut
-
-            timer = self._loop.call_at(self._loop.time() + timeout, fut.cancel)
+            if timeout is not None:
+                timer = self._loop.call_at(self._loop.time() + timeout,
+                                           fut.cancel)
 
             try:
                 return await fut
+            except asyncio.CancelledError:
+                try:
+                    self._getters.remove(fut)
+                except ValueError:
+                    pass
+
+                raise
             finally:
-                timer.cancel()
+                if timeout is not None:
+                    timer.cancel()
 
     def get_nowait(self):
-        return self._queue.popleft()
-
-    # non-standar
-    def clear(self):
-        self._queue.clear()
-        self._getters.clear()
-
-        return not self._queue and not self._getters
+        return self.queue.popleft()