From 7608b607b1b40353a01da15ff6b2240539446a09 Mon Sep 17 00:00:00 2001 From: Terry Jan Reedy Date: Sat, 10 Aug 2013 18:17:13 -0400 Subject: [PATCH] Issue #18676: Change 'positive' to 'non-negative' in queue.py put and get docstrings and ValueError messages. Patch by Zhongyue Luo --- Lib/queue.py | 8 ++++---- Misc/ACKS | 1 + Misc/NEWS | 3 +++ 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Lib/queue.py b/Lib/queue.py index c3296fe1382..3cee36b8961 100644 --- a/Lib/queue.py +++ b/Lib/queue.py @@ -120,7 +120,7 @@ def put(self, item, block=True, timeout=None): If optional args 'block' is true and 'timeout' is None (the default), 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. Otherwise ('block' is false), put an item on the queue if a free slot is immediately available, else raise the Full exception ('timeout' @@ -135,7 +135,7 @@ def put(self, item, block=True, timeout=None): while self._qsize() >= self.maxsize: self.not_full.wait() elif timeout < 0: - raise ValueError("'timeout' must be a positive number") + raise ValueError("'timeout' must be a non-negative number") else: endtime = time() + timeout while self._qsize() >= self.maxsize: @@ -152,7 +152,7 @@ def get(self, block=True, timeout=None): If optional args 'block' is true and 'timeout' is None (the default), 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. Otherwise ('block' is false), return an item if one is immediately available, else raise the Empty exception ('timeout' is ignored @@ -166,7 +166,7 @@ def get(self, block=True, timeout=None): while not self._qsize(): self.not_empty.wait() elif timeout < 0: - raise ValueError("'timeout' must be a positive number") + raise ValueError("'timeout' must be a non-negative number") else: endtime = time() + timeout while not self._qsize(): diff --git a/Misc/ACKS b/Misc/ACKS index 2d3b929f323..349c70e2db6 100644 --- a/Misc/ACKS +++ b/Misc/ACKS @@ -753,6 +753,7 @@ Ray Loyzaga Lukas Lueg Loren Luke Fredrik Lundh +Zhongyue Luo Mark Lutz Jim Lynch Mikael Lyngvig diff --git a/Misc/NEWS b/Misc/NEWS index db8a418524f..4401418d765 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -64,6 +64,9 @@ Core and Builtins Library ------- +- Issue #18676: Change 'positive' to 'non-negative' in queue.py put and get + docstrings and ValueError messages. Patch by Zhongyue Luo + - Issue #18681: Fix a NameError in imp.reload() (noticed by Weizhao Li). - Issue #8112: xlmrpc.server's DocXMLRPCServer server no longer raises an error