[Python-checkins] cpython (merge 3.5 -> default): Merge 3.5

[yury.selivanov]

https://hg.python.org/cpython/rev/2a12f69b32e8
changeset:   97294:2a12f69b32e8
parent:      97292:a572137b4f05
parent:      97293:4721805fc35d
user:        Yury Selivanov <yselivanov at sprymix.com>
date:        Wed Aug 05 19:02:03 2015 -0400
summary:
  Merge 3.5

files:
  Doc/whatsnew/3.5.rst |  19 ++++++++++++++-----
  1 files changed, 14 insertions(+), 5 deletions(-)


diff --git a/Doc/whatsnew/3.5.rst b/Doc/whatsnew/3.5.rst
--- a/Doc/whatsnew/3.5.rst
+++ b/Doc/whatsnew/3.5.rst
@@ -114,6 +114,10 @@
   :func:`gettempdirb` and :func:`gettempprefixb`, have been added to go along
   with this.  This behavior matches that of the :mod:`os` APIs.
 
+* :mod:`ssl` module gained support for Memory BIO, which decouples SSL
+  protocol handling from network IO.  (Contributed by Geert Jansen in
+  :issue:`21965`.)
+
 Security improvements:
 
 * None yet.
@@ -825,11 +829,16 @@
 ssl
 ---
 
-The :meth:`~ssl.SSLSocket.do_handshake`, :meth:`~ssl.SSLSocket.read`,
-:meth:`~ssl.SSLSocket.shutdown`, and :meth:`~ssl.SSLSocket.write` methods of
-:class:`ssl.SSLSocket` don't reset the socket timeout anymore each time bytes
-are received or sent. The socket timeout is now the maximum total duration of
-the method.
+* The :meth:`~ssl.SSLSocket.do_handshake`, :meth:`~ssl.SSLSocket.read`,
+  :meth:`~ssl.SSLSocket.shutdown`, and :meth:`~ssl.SSLSocket.write` methods of
+  :class:`ssl.SSLSocket` don't reset the socket timeout anymore each time bytes
+  are received or sent. The socket timeout is now the maximum total duration of
+  the method.
+
+* Memory BIO Support: new classes :class:`~ssl.SSLObject`,
+  :class:`~ssl.MemoryBIO`, and new
+  :meth:`SSLContext.wrap_bio <ssl.SSLContext.wrap_bio>` method.
+  (Contributed by Geert Jansen in :issue:`21965`.)
 
 socket
 ------

-- 
Repository URL: https://hg.python.org/cpython