From fd740967baf73dcee9d294f690d41d67e81f308c Mon Sep 17 00:00:00 2001
From: R David Murray <rdmurray@bitdance.com>
Date: Sat, 6 Oct 2012 22:08:08 -0400
Subject: [PATCH] More whatsnew updates.  Also move a C-API NEWS item out of
 library section.

---
 Doc/whatsnew/3.3.rst | 27 ++++++++++++++++++++++++++-
 Misc/NEWS            |  8 ++++----
 2 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst
index cb7dd83441c..2ba37f97d81 100644
--- a/Doc/whatsnew/3.3.rst
+++ b/Doc/whatsnew/3.3.rst
@@ -940,6 +940,14 @@ ASCII-only Unicode strings are now accepted by the decoding functions of the
 modern interface. For example, ``base64.b64decode('YWJj')`` returns ``b'abc'``.
 
 
+binascii
+--------
+
+In addition to the binary objects they normally accept, the ``a2b_`` functions
+now all also accept ASCII-only strings as input.  (Contributed by Antoine
+Pitrou in :issue:`13637`.)
+
+
 bz2
 ---
 
@@ -1403,6 +1411,11 @@ can be used to directly manage when the accumlated headers are sent.
 :class:`http.server` now produces valid ``HTML 4.01 strict`` output.
 (Contributed by Ezio Melotti in :issue:`13295`.)
 
+:class:`http.client.HTTPResponse` now has a
+:meth:`~http.client.HTTPResponse.readinto` method, which means it can be used
+as a :class:`io.RawIOBase` class.  (Contributed by John Kuhn in
+:issue:`13464`.)
+
 
 html
 ----
@@ -1912,7 +1925,8 @@ ssl
   SCRAM-SHA-1-PLUS.  (Contributed by Jacek Konieczny in :issue:`12551`)
 
 * You can query the SSL compression algorithm used by an SSL socket, thanks
-  to its new :meth:`~ssl.SSLSocket.compression` method.
+  to its new :meth:`~ssl.SSLSocket.compression` method.  The new attribute
+  :attr:`~ssl.OP_NO_COMPRESSION` can be used to disable compression.
   (Contributed by Antoine Pitrou in :issue:`13634`)
 
 * Support has been added for the Next Procotol Negotiation extension using
@@ -1926,6 +1940,10 @@ ssl
 * The :func:`~ssl.get_server_certificate` function now supports IPv6.
   (Contributed by Charles-François Natali in :issue:`11811`.)
 
+* New attribute :attr:`~ssl.OP_CIPHER_SERVER_PREFERENCE` allows setting
+  SSLv3 server sockets to use the server's cipher ordering preference rather
+  than the client's (:issue:`13635`).
+
 
 stat
 ----
@@ -1964,6 +1982,13 @@ sequence` holding informations about the thread implementation
 (:issue:`11223`).
 
 
+tarfile
+-------
+
+:mod:`tarfile` now supports ``lzma`` encoding via the :mod:`lzma` module.
+(Contributed by Lars Gustäbel in :issue:`5689`.)
+
+
 tempfile
 --------
 
diff --git a/Misc/NEWS b/Misc/NEWS
index 4ab80d51d90..396a60f039d 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -2066,6 +2066,10 @@ Core and Builtins
 
 - PEP 3151 / issue #12555: reworking the OS and IO exception hierarchy.
 
+- Issue #13560: Add PyUnicode_DecodeLocale(), PyUnicode_DecodeLocaleAndSize()
+  and PyUnicode_EncodeLocale() functions to the C API to decode/encode from/to
+  the current locale encoding.
+
 - Add internal API for static strings (_Py_identifier et al.).
 
 - Issue #13063: the Windows error ERROR_NO_DATA (numbered 232 and described
@@ -2639,10 +2643,6 @@ Library
 - Issue #13560: os.strerror() now uses the current locale encoding instead of
   UTF-8.
 
-- Issue #13560: Add PyUnicode_DecodeLocale(), PyUnicode_DecodeLocaleAndSize()
-  and PyUnicode_EncodeLocale() functions to the C API to decode/encode from/to
-  the current locale encoding.
-
 - Issue #8373: The filesystem path of AF_UNIX sockets now uses the filesystem
   encoding and the surrogateescape error handler, rather than UTF-8.  Patch
   by David Watson.