summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2011-10-12 14:23:02 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2011-10-12 14:23:02 (GMT)
commit9b7fcf8c2e3a64735c72fe319141a0e76458dfbb (patch)
tree2783ec69a9e08bca711825bdd94198b395676fea /Doc
parent70fa31c936fa889554f19792eadcffa8f82b3a76 (diff)
downloadcpython-9b7fcf8c2e3a64735c72fe319141a0e76458dfbb.zip
cpython-9b7fcf8c2e3a64735c72fe319141a0e76458dfbb.tar.gz
cpython-9b7fcf8c2e3a64735c72fe319141a0e76458dfbb.tar.bz2
Minimal update of select docs for PEP 3151.
Diffstat (limited to 'Doc')
-rw-r--r--Doc/library/select.rst12
1 files changed, 4 insertions, 8 deletions
diff --git a/Doc/library/select.rst b/Doc/library/select.rst
index f1fd126..a4bc6fc 100644
--- a/Doc/library/select.rst
+++ b/Doc/library/select.rst
@@ -18,9 +18,10 @@ The module defines the following:
.. exception:: error
- The exception raised when an error occurs. The accompanying value is a pair
- containing the numeric error code from :c:data:`errno` and the corresponding
- string, as would be printed by the C function :c:func:`perror`.
+ A deprecated alias of :exc:`OSError`.
+
+ .. versionchanged:: 3.3
+ Following :pep:`3151`, this class was made an alias of :exc:`OSError`.
.. function:: epoll(sizehint=-1)
@@ -165,11 +166,6 @@ Edge and Level Trigger Polling (epoll) Objects
Register a fd descriptor with the epoll object.
- .. note::
-
- Registering a file descriptor that's already registered raises an
- IOError -- contrary to :ref:`poll-objects`'s register.
-
.. method:: epoll.modify(fd, eventmask)