diff options
| author | Benjamin Peterson <benjamin@python.org> | 2011-06-27 14:16:23 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2011-06-27 14:16:23 (GMT) |
| commit | 4a5d599b3663e20fafd7f710d6e8e794701d7842 (patch) | |
| tree | 872c1fd99eb70904649ef1fa42507cfebaf70fd9 | |
| parent | 7e6b3aac856f92b155daddd8607eb128ce4e33b8 (diff) | |
| parent | 2bd9100b2aa3d49f72e2020ecaa6105ef0a065c5 (diff) | |
| download | cpython-4a5d599b3663e20fafd7f710d6e8e794701d7842.zip cpython-4a5d599b3663e20fafd7f710d6e8e794701d7842.tar.gz cpython-4a5d599b3663e20fafd7f710d6e8e794701d7842.tar.bz2 | |
merge heads
| -rw-r--r-- | Modules/selectmodule.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/selectmodule.c b/Modules/selectmodule.c index 5192ce7..ac604b6 100644 --- a/Modules/selectmodule.c +++ b/Modules/selectmodule.c @@ -912,7 +912,7 @@ pyepoll_register(pyEpoll_Object *self, PyObject *args, PyObject *kwds) PyDoc_STRVAR(pyepoll_register_doc, "register(fd[, eventmask]) -> None\n\ \n\ -Registers a new fd or modifies an already registered fd.\n\ +Registers a new fd or raises an IOError if the fd is already registered.\n\ fd is the target file descriptor of the operation.\n\ events is a bit set composed of the various EPOLL constants; the default\n\ is EPOLL_IN | EPOLL_OUT | EPOLL_PRI.\n\ |