diff options
author | Victor Stinner <victor.stinner@gmail.com> | 2014-10-10 10:47:01 (GMT) |
---|---|---|
committer | Victor Stinner <victor.stinner@gmail.com> | 2014-10-10 10:47:01 (GMT) |
commit | 9558e90315fce8c114662e4e6d72fbdad0da9cc6 (patch) | |
tree | e6f7cc48e468c294f0cb51cc127869b9ed2e9ac6 /Doc/library/ssl.rst | |
parent | 92127a5edb9e5b045fad4d187fafcc89aaa03637 (diff) | |
parent | cfb2a0a8559d6d4b3011f1bc04147d25819c7907 (diff) | |
download | cpython-9558e90315fce8c114662e4e6d72fbdad0da9cc6.zip cpython-9558e90315fce8c114662e4e6d72fbdad0da9cc6.tar.gz cpython-9558e90315fce8c114662e4e6d72fbdad0da9cc6.tar.bz2 |
Merge 3.4
Diffstat (limited to 'Doc/library/ssl.rst')
-rw-r--r-- | Doc/library/ssl.rst | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/Doc/library/ssl.rst b/Doc/library/ssl.rst index b5195f6..9aa3021 100644 --- a/Doc/library/ssl.rst +++ b/Doc/library/ssl.rst @@ -816,7 +816,7 @@ SSL sockets also have the following additional methods and attributes: instead, and return the number of bytes read. Raise :exc:`SSLWantReadError` or :exc:`SSLWantWriteError` if the socket is - non-blocking and the read would block. + :ref:`non-blocking <ssl-nonblocking>` and the read would block. As at any time a re-negotiation is possible, a call to :meth:`read` can also cause write operations. @@ -827,7 +827,7 @@ SSL sockets also have the following additional methods and attributes: *buf* argument must be an object supporting the buffer interface. Raise :exc:`SSLWantReadError` or :exc:`SSLWantWriteError` if the socket is - non-blocking and the write would block. + :ref:`non-blocking <ssl-nonblocking>` and the write would block. As at any time a re-negotiation is possible, a call to :meth:`write` can also cause read operations. @@ -1729,6 +1729,14 @@ thus several things you need to be aware of: except ssl.SSLWantWriteError: select.select([], [sock], []) +.. seealso:: + + The :mod:`asyncio` module supports non-blocking SSL sockets and provides a + higher level API. It polls for events using the :mod:`selectors` module and + handles :exc:`SSLWantWriteError`, :exc:`SSLWantReadError` and + :exc:`BlockingIOError` exceptions. It runs the SSL handshake asynchronously + as well. + Memory BIO Support ------------------ |