Commit bb8114cb authored by Terry Jan Reedy's avatar Terry Jan Reedy

Issue #18676: Change 'positive' to 'non-negative' in queue.py put and get

docstrings and ValueError messages. Patch by Zhongyue Luo
parent 0fd11565
...@@ -109,7 +109,7 @@ class Queue: ...@@ -109,7 +109,7 @@ class Queue:
If optional args 'block' is true and 'timeout' is None (the default), If optional args 'block' is true and 'timeout' is None (the default),
block if necessary until a free slot is available. If 'timeout' is block if necessary until a free slot is available. If 'timeout' is
a positive number, it blocks at most 'timeout' seconds and raises a non-negative number, it blocks at most 'timeout' seconds and raises
the Full exception if no free slot was available within that time. the Full exception if no free slot was available within that time.
Otherwise ('block' is false), put an item on the queue if a free slot Otherwise ('block' is false), put an item on the queue if a free slot
is immediately available, else raise the Full exception ('timeout' is immediately available, else raise the Full exception ('timeout'
...@@ -125,7 +125,7 @@ class Queue: ...@@ -125,7 +125,7 @@ class Queue:
while self._qsize() == self.maxsize: while self._qsize() == self.maxsize:
self.not_full.wait() self.not_full.wait()
elif timeout < 0: elif timeout < 0:
raise ValueError("'timeout' must be a positive number") raise ValueError("'timeout' must be a non-negative number")
else: else:
endtime = _time() + timeout endtime = _time() + timeout
while self._qsize() == self.maxsize: while self._qsize() == self.maxsize:
...@@ -152,7 +152,7 @@ class Queue: ...@@ -152,7 +152,7 @@ class Queue:
If optional args 'block' is true and 'timeout' is None (the default), If optional args 'block' is true and 'timeout' is None (the default),
block if necessary until an item is available. If 'timeout' is block if necessary until an item is available. If 'timeout' is
a positive number, it blocks at most 'timeout' seconds and raises a non-negative number, it blocks at most 'timeout' seconds and raises
the Empty exception if no item was available within that time. the Empty exception if no item was available within that time.
Otherwise ('block' is false), return an item if one is immediately Otherwise ('block' is false), return an item if one is immediately
available, else raise the Empty exception ('timeout' is ignored available, else raise the Empty exception ('timeout' is ignored
...@@ -167,7 +167,7 @@ class Queue: ...@@ -167,7 +167,7 @@ class Queue:
while not self._qsize(): while not self._qsize():
self.not_empty.wait() self.not_empty.wait()
elif timeout < 0: elif timeout < 0:
raise ValueError("'timeout' must be a positive number") raise ValueError("'timeout' must be a non-negative number")
else: else:
endtime = _time() + timeout endtime = _time() + timeout
while not self._qsize(): while not self._qsize():
......
...@@ -629,6 +629,7 @@ Ray Loyzaga ...@@ -629,6 +629,7 @@ Ray Loyzaga
Lukas Lueg Lukas Lueg
Loren Luke Loren Luke
Fredrik Lundh Fredrik Lundh
Zhongyue Luo
Mark Lutz Mark Lutz
Jim Lynch Jim Lynch
Mikael Lyngvig Mikael Lyngvig
......
...@@ -29,6 +29,9 @@ Core and Builtins ...@@ -29,6 +29,9 @@ Core and Builtins
Library Library
------- -------
- Issue #18676: Change 'positive' to 'non-negative' in queue.py put and get
docstrings and ValueError messages. Patch by Zhongyue Luo
- Issue #17998: Fix an internal error in regular expression engine. - Issue #17998: Fix an internal error in regular expression engine.
- Issue #17557: Fix os.getgroups() to work with the modified behavior of - Issue #17557: Fix os.getgroups() to work with the modified behavior of
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment