From: Terry Jan Reedy Date: Sat, 10 Aug 2013 22:33:37 +0000 (-0400) Subject: Merge heads X-Git-Tag: v3.4.0a2~251^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=56ecb366d60a1df4127006b3db633c14bef8e646;p=python Merge heads --- 56ecb366d60a1df4127006b3db633c14bef8e646 diff --cc Misc/NEWS index dededc7df2,1bbb17e29f..75c832ceb1 --- a/Misc/NEWS +++ b/Misc/NEWS @@@ -24,9 -24,8 +24,11 @@@ Core and Builtin 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 if methods have annotations; it now correctly displays the annotations.