From: Antoine Pitrou <solipsis@pitrou.net>
Date: Wed, 31 Jul 2013 19:54:18 +0000 (+0200)
Subject: Merge
X-Git-Tag: v3.4.0a1~37
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c27cd71cd71e5b3f464f6994e2a73f201eb430ca;p=thirdparty%2FPython%2Fcpython.git

Merge
---

c27cd71cd71e5b3f464f6994e2a73f201eb430ca
diff --cc Misc/NEWS
index 1ef477f09f1e,a4aabbeba4b7..e5fd939b1653
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -173,10 -173,8 +173,12 @@@ Core and Builtin
  Library
  -------
  
 +- Issue #15699: The readline module now uses PEP 3121-style module
 +  initialization, so as to reclaim allocated resources (Python callbacks)
 +  at shutdown.  Original patch by Robin Schreiber.
 +
+ - Issue #17616: wave.open now supports the context manager protocol.
+ 
  - Issue #18599: Fix name attribute of _sha1.sha1() object. It now returns
    'SHA1' instead of 'SHA'.