diff options
| author | Benjamin Peterson <benjamin@python.org> | 2011-06-27 14:16:40 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2011-06-27 14:16:40 (GMT) |
| commit | dd6098b8a1c0e5ccda4c621b080960cfcf2c8cab (patch) | |
| tree | 6d1bb4457eff5eb3baa49e19c6f4759e23839641 /Modules/selectmodule.c | |
| parent | 68151d4f7fa783945ce904ad2eaced396daa49d1 (diff) | |
| parent | 7d80bd19096726dabde3effa8af89ec62365c0c0 (diff) | |
| download | cpython-dd6098b8a1c0e5ccda4c621b080960cfcf2c8cab.zip cpython-dd6098b8a1c0e5ccda4c621b080960cfcf2c8cab.tar.gz cpython-dd6098b8a1c0e5ccda4c621b080960cfcf2c8cab.tar.bz2 | |
merge 3.2
Diffstat (limited to 'Modules/selectmodule.c')
| -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 5aa67dd..20f23d9 100644 --- a/Modules/selectmodule.c +++ b/Modules/selectmodule.c @@ -921,7 +921,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\ |