diff options
| author | Benjamin Peterson <benjamin@python.org> | 2011-06-27 14:16:14 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2011-06-27 14:16:14 (GMT) |
| commit | a63a530eaba50a3d901ec4d1fe90a491fc79f5fd (patch) | |
| tree | 3ccfaa1d0077b6ded8e520e0f622dfe9ae5978f5 | |
| parent | 8d7706955849c0e3569e2cb225435c322dfa677e (diff) | |
| parent | 7d80bd19096726dabde3effa8af89ec62365c0c0 (diff) | |
| download | cpython-a63a530eaba50a3d901ec4d1fe90a491fc79f5fd.zip cpython-a63a530eaba50a3d901ec4d1fe90a491fc79f5fd.tar.gz cpython-a63a530eaba50a3d901ec4d1fe90a491fc79f5fd.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 65e1826..1285e65 100644 --- a/Modules/selectmodule.c +++ b/Modules/selectmodule.c @@ -916,7 +916,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\ |