summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorTerry Jan Reedy <tjreedy@udel.edu>2013-08-10 22:40:04 (GMT)
committerTerry Jan Reedy <tjreedy@udel.edu>2013-08-10 22:40:04 (GMT)
commite1acf347a59cf9948c0d7a3282786cdfe3cd1597 (patch)
tree1c4dc4c75b7ab80e65b9db477429079dc00a9bd9 /Misc
parent40322e6ad5f705e294ded37fa4a682f065ec80a2 (diff)
parent56ecb366d60a1df4127006b3db633c14bef8e646 (diff)
downloadcpython-e1acf347a59cf9948c0d7a3282786cdfe3cd1597.zip
cpython-e1acf347a59cf9948c0d7a3282786cdfe3cd1597.tar.gz
cpython-e1acf347a59cf9948c0d7a3282786cdfe3cd1597.tar.bz2
Merge
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 d847662..a9f2b8b 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
+
- Fix refcounting issue with extension types in tkinter.
- Issue #8112: xlmrpc.server's DocXMLRPCServer server no longer raises an error
@@ -826,7 +829,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