summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorR. David Murray <rdmurray@bitdance.com>2009-05-31 19:44:27 (GMT)
committerR. David Murray <rdmurray@bitdance.com>2009-05-31 19:44:27 (GMT)
commit1855c214d78b15dd6a46a97dc585503b34e49807 (patch)
tree8156c8ae772e92e31122270e5aadee4b4cf8bd6a /Doc
parenta35f4b99158f4c5a4b237e76ed1d776d28170d4d (diff)
downloadcpython-1855c214d78b15dd6a46a97dc585503b34e49807.zip
cpython-1855c214d78b15dd6a46a97dc585503b34e49807.tar.gz
cpython-1855c214d78b15dd6a46a97dc585503b34e49807.tar.bz2
Merged revisions 73077 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r73077 | r.david.murray | 2009-05-31 15:15:57 -0400 (Sun, 31 May 2009) | 4 lines Issue 3848: document the fact that epoll register raises an IOError if an fd is registered twice, and add some additional epoll tests. Patch by Christian Heimes. ........
Diffstat (limited to 'Doc')
-rw-r--r--Doc/library/select.rst5
1 files changed, 5 insertions, 0 deletions
diff --git a/Doc/library/select.rst b/Doc/library/select.rst
index 48e289a..6dbf16f 100644
--- a/Doc/library/select.rst
+++ b/Doc/library/select.rst
@@ -154,6 +154,11 @@ 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)