Factor put with put_nowait, and get with get_nowait.

diff --git a/tornado/queues.py b/tornado/queues.py
index 562fc6c55d5c8d348d2df83faf9a291da35bb567..1f4bb9fad42570fc5c604f7b09ac9cca236f4a15 100644 (file)
--- a/tornado/queues.py
+++ b/tornado/queues.py
@@ -78,14 +78,9 @@ class Queue(object):
         Returns a Future, which raises `tornado.gen.TimeoutError` after a
         timeout.
         """
-        self._consume_expired()
-        if self._getters:
-            assert not self._queue, "queue non-empty, why are getters waiting?"
-            getter = self._getters.popleft()
-            self._put(item)
-            getter.set_result(self._get())
-            return gen._null_future
-        elif self.full():
+        try:
+            self.put_nowait(item)
+        except QueueFull:
             future = Future()
             self._putters.append((item, future))
             if timeout:
@@ -94,7 +89,6 @@ class Queue(object):
                 ioloop.IOLoop.current().add_timeout(timeout, on_timeout)
             return future
         else:
-            self._put(item)
             return gen._null_future
 
     def put_nowait(self, item):
@@ -106,7 +100,6 @@ class Queue(object):
         if self._getters:
             assert self.empty(), "queue non-empty, why are getters waiting?"
             getter = self._getters.popleft()
-
             self._put(item)
             getter.set_result(self._get())
         elif self.full():
@@ -120,25 +113,16 @@ class Queue(object):
         Returns a Future which resolves once an item is available, or raises
         `tornado.gen.TimeoutError` after a timeout.
         """
-        self._consume_expired()
-        if self._putters:
-            assert self.full(), "queue not full, why are putters waiting?"
-            item, putter = self._putters.popleft()
-            self._put(item)
-            putter.set_result(None)
-
-        if self.qsize():
-            future = Future()
-            future.set_result(self._get())
-            return future
-        else:
-            future = Future()
+        future = Future()
+        try:
+            future.set_result(self.get_nowait())
+        except QueueEmpty:
             self._getters.append(future)
             if timeout:
                 def on_timeout():
                     future.set_exception(gen.TimeoutError())
                 ioloop.IOLoop.current().add_timeout(timeout, on_timeout)
-            return future
+        return future
 
     def get_nowait(self):
         """Remove and return an item from the queue without blocking.