merge from 3.2
This commit is contained in:
commit
504783975b
|
@ -921,7 +921,7 @@ pyepoll_register(pyEpoll_Object *self, PyObject *args, PyObject *kwds)
|
||||||
PyDoc_STRVAR(pyepoll_register_doc,
|
PyDoc_STRVAR(pyepoll_register_doc,
|
||||||
"register(fd[, eventmask]) -> None\n\
|
"register(fd[, eventmask]) -> None\n\
|
||||||
\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\
|
fd is the target file descriptor of the operation.\n\
|
||||||
events is a bit set composed of the various EPOLL constants; the default\n\
|
events is a bit set composed of the various EPOLL constants; the default\n\
|
||||||
is EPOLL_IN | EPOLL_OUT | EPOLL_PRI.\n\
|
is EPOLL_IN | EPOLL_OUT | EPOLL_PRI.\n\
|
||||||
|
|
Loading…
Reference in New Issue