summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2011-03-15 19:45:20 (GMT)
committerBenjamin Peterson <benjamin@python.org>2011-03-15 19:45:20 (GMT)
commite97a5b2bda0b1b0352137e564a93e0176b6619e5 (patch)
tree364c998e611d1347d960263d6b539a02fad526cc /Misc
parentd6afe724cb8a701d6ad2adeb1d8d20e4fde6fca0 (diff)
parentffdbbcaf715323f653388966eec5c42bf6b139c5 (diff)
downloadcpython-e97a5b2bda0b1b0352137e564a93e0176b6619e5.zip
cpython-e97a5b2bda0b1b0352137e564a93e0176b6619e5.tar.gz
cpython-e97a5b2bda0b1b0352137e564a93e0176b6619e5.tar.bz2
merge heads
Diffstat (limited to 'Misc')
-rw-r--r--Misc/ACKS1
-rw-r--r--Misc/NEWS8
2 files changed, 9 insertions, 0 deletions
diff --git a/Misc/ACKS b/Misc/ACKS
index d0b8951..c998250 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -376,6 +376,7 @@ Kevan Heydon
Jason Hildebrand
Richie Hindle
Konrad Hinsen
+Michael Henry
David Hobley
Tim Hochberg
Joerg-Cyril Hoehle
diff --git a/Misc/NEWS b/Misc/NEWS
index f9c4c9e..018c62d 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -68,6 +68,12 @@ Core and Builtins
Library
-------
+- Issue #11289: `smtp.SMTP` class becomes a context manager so it can be used
+ in a `with` statement. Contributed by Giampaolo Rodola.
+
+- Issue #11554: Fixed support for Japanese codecs; previously the body output
+ encoding was not done if euc-jp or shift-jis was specified as the charset.
+
- Issue #11509: Significantly increase test coverage of fileinput.
Patch by Denver Coneybeare at PyCon 2011 Sprints.
@@ -206,6 +212,8 @@ Tools/Demos
Tests
-----
+- Issue #11554: Reactivated test_email_codecs.
+
- Issue #11505: improves test coverage of string.py
- Issue #11490: test_subprocess:test_leaking_fds_on_error no longer gives a