diff options
| author | Senthil Kumaran <senthil@uthcode.com> | 2011-06-26 23:49:49 -0700 |
|---|---|---|
| committer | Senthil Kumaran <senthil@uthcode.com> | 2011-06-26 23:49:49 -0700 |
| commit | 504783975bcf12e6c70d2f4193ff821e475d44a7 (patch) | |
| tree | c9ef26b630270c4d474a0d1dc4bf556ea87e2a00 | |
| parent | ea30a5e6bd1ea92b57745a486591ba89332b307c (diff) | |
| parent | 7d80bd19096726dabde3effa8af89ec62365c0c0 (diff) | |
| download | cpython-git-504783975bcf12e6c70d2f4193ff821e475d44a7.tar.gz | |
merge from 3.2
| -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 5aa67ddffa..20f23d9260 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\ |