summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2011-06-19 14:38:02 (GMT)
committerBenjamin Peterson <benjamin@python.org>2011-06-19 14:38:02 (GMT)
commit12f2bffce1be0e36e2cf11a8be80de7fcb76dd54 (patch)
tree1f37a3639480738daf90d359dbc239ac664860f3 /Misc
parentdefe6f61fe8595d0d2cc194c120ef0b3dc3a4286 (diff)
parent2510d9e8d9d3244c8d35efdd01bca265755655de (diff)
downloadcpython-12f2bffce1be0e36e2cf11a8be80de7fcb76dd54.zip
cpython-12f2bffce1be0e36e2cf11a8be80de7fcb76dd54.tar.gz
cpython-12f2bffce1be0e36e2cf11a8be80de7fcb76dd54.tar.bz2
merge heads
Diffstat (limited to 'Misc')
-rw-r--r--Misc/ACKS1
-rw-r--r--Misc/NEWS11
2 files changed, 12 insertions, 0 deletions
diff --git a/Misc/ACKS b/Misc/ACKS
index 163d9b8..50a8e34 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1013,6 +1013,7 @@ David Wolever
Klaus-Juergen Wolf
Dan Wolfe
Richard Wolff
+Adam Woodbeck
Darren Worrall
Gordon Worley
Thomas Wouters
diff --git a/Misc/NEWS b/Misc/NEWS
index 4c2aaa8..c05a32a 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -193,6 +193,17 @@ Core and Builtins
Library
-------
+- Issue #6771: moved the curses.wrapper function from the single-function
+ wrapper module into __init__, eliminating the module. Since __init__ was
+ already importing the function to curses.wrapper, there is no API change.
+
+- Issue #11584: email.header.decode_header no longer fails if the header
+ passed to it is a Header object, and Header/make_header no longer fail
+ if given binary unknown-8bit input.
+
+- Issue #11700: mailbox proxy object close methods can now be called multiple
+ times without error.
+
- Issue #11767: Correct file descriptor leak in mailbox's __getitem__ method.
- Issue #12133: AbstractHTTPHandler.do_open() of urllib.request closes the HTTP