[Python-checkins] cpython (merge 3.2 -> default): merge from 3.2
senthil.kumaran
python-checkins at python.org
Mon Jun 27 08:50:02 CEST 2011
http://hg.python.org/cpython/rev/ddb8a29a6bc5
changeset: 71002:ddb8a29a6bc5
parent: 70999:fcf242243d46
parent: 71001:0610f70e6694
user: Senthil Kumaran <senthil at uthcode.com>
date: Sun Jun 26 23:49:49 2011 -0700
summary:
merge from 3.2
files:
Modules/selectmodule.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Modules/selectmodule.c b/Modules/selectmodule.c
--- a/Modules/selectmodule.c
+++ b/Modules/selectmodule.c
@@ -921,7 +921,7 @@
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\
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list