summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorTerry Jan Reedy <tjreedy@udel.edu>2013-08-10 22:23:18 (GMT)
committerTerry Jan Reedy <tjreedy@udel.edu>2013-08-10 22:23:18 (GMT)
commitee8f773c25058fb2bb3e4b359806e20d28042307 (patch)
tree0911ff39b4ef371f3db5ed221bd81c1436cf7e0f /Misc
parentb723a12c044bcaf499a74786f478f1756a94e8e0 (diff)
parent7608b607b1b40353a01da15ff6b2240539446a09 (diff)
downloadcpython-ee8f773c25058fb2bb3e4b359806e20d28042307.zip
cpython-ee8f773c25058fb2bb3e4b359806e20d28042307.tar.gz
cpython-ee8f773c25058fb2bb3e4b359806e20d28042307.tar.bz2
Issue #18676: Merge from 3.3
Diffstat (limited to 'Misc')
-rw-r--r--Misc/ACKS1
-rw-r--r--Misc/NEWS5
2 files changed, 5 insertions, 1 deletions
diff --git a/Misc/ACKS b/Misc/ACKS
index 7717941..be7abdb 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -773,6 +773,7 @@ Ray Loyzaga
Lukas Lueg
Loren Luke
Fredrik Lundh
+Zhongyue Luo
Mark Lutz
Taras Lyapun
Jim Lynch
diff --git a/Misc/NEWS b/Misc/NEWS
index 5c73479..dededc7 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -24,6 +24,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 #8112: xlmrpc.server's DocXMLRPCServer server no longer raises an error
if methods have annotations; it now correctly displays the annotations.
@@ -821,7 +824,7 @@ Windows
Build
-----
-- Issue #16067: Add description into MSI file to replace installer's
+- Issue #16067: Add description into MSI file to replace installer's
temporary name.
- Issue #18257: Fix readlink usage in python-config. Install the python