mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-09 16:34:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 17

Simplified the new get/get_nowait/put/put_nowait implementations a bit.

Browse source
This commit is contained in:
Tim Peters 2004-07-12 01:20:32 +00:00
parent 5af0e41482
commit 71ed2201e2
1 changed files with 12 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

39
Lib/Queue.py
View file

@ -68,11 +68,12 @@ class Queue:
is immediately available, else raise the Full exception ('timeout' is immediately available, else raise the Full exception ('timeout'
is ignored in that case). is ignored in that case).
""" """
if not block:
return self.put_nowait(item)
self.not_full.acquire() self.not_full.acquire()
try: try:
if timeout is None: if not block:
if self._full():
raise Full
elif timeout is None:
while self._full(): while self._full():
self.not_full.wait() self.not_full.wait()
else: else:
@ -81,7 +82,7 @@ class Queue:
endtime = _time() + timeout endtime = _time() + timeout
while self._full(): while self._full():
remaining = endtime - _time() remaining = endtime - _time()
if remaining < 0.0: if remaining <= 0.0:
raise Full raise Full
self.not_full.wait(remaining) self.not_full.wait(remaining)
self._put(item) self._put(item)
@ -95,15 +96,7 @@ class Queue:
Only enqueue the item if a free slot is immediately available. Only enqueue the item if a free slot is immediately available.
Otherwise raise the Full exception. Otherwise raise the Full exception.
""" """
self.not_full.acquire() return self.put(item, False)
try:
if self._full():
raise Full
else:
self._put(item)
self.not_empty.notify()
finally:
self.not_full.release()
def get(self, block=True, timeout=None): def get(self, block=True, timeout=None):
"""Remove and return an item from the queue. """Remove and return an item from the queue.
@ -116,11 +109,12 @@ class Queue:
available, else raise the Empty exception ('timeout' is ignored available, else raise the Empty exception ('timeout' is ignored
in that case). in that case).
""" """
if not block:
return self.get_nowait()
self.not_empty.acquire() self.not_empty.acquire()
try: try:
if timeout is None: if not block:
if self._empty():
raise Empty
elif timeout is None:
while self._empty(): while self._empty():
self.not_empty.wait() self.not_empty.wait()
else: else:
@ -129,7 +123,7 @@ class Queue:
endtime = _time() + timeout endtime = _time() + timeout
while self._empty(): while self._empty():
remaining = endtime - _time() remaining = endtime - _time()
if remaining < 0.0: if remaining <= 0.0:
raise Empty raise Empty
self.not_empty.wait(remaining) self.not_empty.wait(remaining)
item = self._get() item = self._get()
@ -144,16 +138,7 @@ class Queue:
Only get an item if one is immediately available. Otherwise Only get an item if one is immediately available. Otherwise
raise the Empty exception. raise the Empty exception.
""" """
self.not_empty.acquire() return self.get(False)
try:
if self._empty():
raise Empty
else:
item = self._get()
self.not_full.notify()
return item
finally:
self.not_empty.release()
# Override these methods to implement other queue organizations # Override these methods to implement other queue organizations
# (e.g. stack or priority queue). # (e.g. stack or priority queue).