[Python-checkins] r84907 - python/branches/py3k/Doc/library/ssl.rst

Sun Sep 19 15:56:11 CEST 2010

Author: antoine.pitrou
Date: Sun Sep 19 15:56:11 2010
New Revision: 84907
Log:
Be more precise as to what operations are supported
Modified:
 python/branches/py3k/Doc/library/ssl.rst
Modified: python/branches/py3k/Doc/library/ssl.rst
==============================================================================

--- python/branches/py3k/Doc/library/ssl.rst	(original)
+++ python/branches/py3k/Doc/library/ssl.rst	Sun Sep 19 15:56:11 2010
@@ -325,11 +325,27 @@
 SSL Sockets
 -----------
 
-SSL sockets provide the basic interface of :ref:`socket-objects`. However,
-not all functionality is supported (for example, passing a non-zero ``flags``
-argument to :meth:`~socket.socket.recv()` is not allowed).
+SSL sockets provide the following methods of :ref:`socket-objects`:
 
-SSL sockets also have the following additional methods and attributes:
+- :meth:`~socket.socket.accept()`
+- :meth:`~socket.socket.bind()`
+- :meth:`~socket.socket.close()`
+- :meth:`~socket.socket.connect()`
+- :meth:`~socket.socket.detach()`
+- :meth:`~socket.socket.fileno()`
+- :meth:`~socket.socket.getpeername()`, :meth:`~socket.socket.getsockname()`
+- :meth:`~socket.socket.getsockopt()`, :meth:`~socket.socket.setsockopt()`
+- :meth:`~socket.socket.gettimeout()`, :meth:`~socket.socket.settimeout()`,
+ :meth:`~socket.socket.setblocking()`
+- :meth:`~socket.socket.listen()`
+- :meth:`~socket.socket.makefile()`
+- :meth:`~socket.socket.recv()`, :meth:`~socket.socket.recv_into()`
+ (but passing a non-zero ``flags`` argument is not allowed)
+- :meth:`~socket.socket.send()`, :meth:`~socket.socket.sendall()` (with
+ the same limitation)
+- :meth:`~socket.socket.shutdown()`
+
+They also have the following additional methods and attributes:
 
 .. method:: SSLSocket.do_handshake()
 
