summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2011-07-03 18:44:56 (GMT)
committerBenjamin Peterson <benjamin@python.org>2011-07-03 18:44:56 (GMT)
commitd2ed63024312630d11b0800d985f8b1fa96711a3 (patch)
tree4ebfdc173d04eaf2a9b9c5ef040467be3da51fbd /Misc
parent83195c3f0cffc571e265ca7e42cbbe1f27c792e1 (diff)
parent946eb865a3d163dc5aa242827d562933c89c9c5b (diff)
downloadcpython-d2ed63024312630d11b0800d985f8b1fa96711a3.zip
cpython-d2ed63024312630d11b0800d985f8b1fa96711a3.tar.gz
cpython-d2ed63024312630d11b0800d985f8b1fa96711a3.tar.bz2
merge heads
Diffstat (limited to 'Misc')
-rw-r--r--Misc/ACKS1
-rw-r--r--Misc/NEWS6
2 files changed, 7 insertions, 0 deletions
diff --git a/Misc/ACKS b/Misc/ACKS
index 74409f7..45b4042 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -265,6 +265,7 @@ Michael Ernst
Ben Escoto
Andy Eskilsson
Stefan Esser
+Nicolas Estibals
Stephen D Evans
Carey Evans
Tim Everett
diff --git a/Misc/NEWS b/Misc/NEWS
index a05cc36..99ebd1b 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -27,6 +27,9 @@ What's New in Python 3.2.1 release candidate 2?
Core and Builtins
-----------------
+- Issue #12291: You can now load multiple marshalled objects from a stream,
+ with other data interleaved between marshalled objects.
+
- Issue #12084: os.stat on Windows now works properly with relative symbolic
links when called from any directory.
@@ -42,6 +45,9 @@ Core and Builtins
Library
-------
+- Issue #12147: Adjust the new-in-3.2 smtplib.send_message method for better
+ conformance to the RFCs: correctly handle Sender and Resent- headers.
+
- Issue #12352: Fix a deadlock in multiprocessing.Heap when a block is freed by
the garbage collector while the Heap lock is held.