From 61bd72924e805b0e563719863febb65ad96e91ae Mon Sep 17 00:00:00 2001 From: Raymond Hettinger Date: Mon, 9 Jan 2012 06:02:08 +0000 Subject: [PATCH] Improve clarity with keyword argument for block. Move nowait methods together. --- Lib/queue.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Lib/queue.py b/Lib/queue.py index c65ba4b46df..c31310e2ff6 100644 --- a/Lib/queue.py +++ b/Lib/queue.py @@ -145,14 +145,6 @@ class Queue: self.unfinished_tasks += 1 self.not_empty.notify() - def put_nowait(self, item): - """Put an item into the queue without blocking. - - Only enqueue the item if a free slot is immediately available. - Otherwise raise the Full exception. - """ - return self.put(item, False) - def get(self, block=True, timeout=None): """Remove and return an item from the queue. @@ -184,13 +176,21 @@ class Queue: self.not_full.notify() return item + def put_nowait(self, item): + """Put an item into the queue without blocking. + + Only enqueue the item if a free slot is immediately available. + Otherwise raise the Full exception. + """ + return self.put(item, block=False) + def get_nowait(self): """Remove and return an item from the queue without blocking. Only get an item if one is immediately available. Otherwise raise the Empty exception. """ - return self.get(False) + return self.get(block=False) # Override these methods to implement other queue organizations # (e.g. stack or priority queue).