[Python-checkins] cpython (merge 2.7 -> 2.7): merge heads

[benjamin.peterson]

http://hg.python.org/cpython/rev/7b381d8f89d1
changeset:   71008:7b381d8f89d1
branch:      2.7
parent:      71005:55219254eb77
parent:      71003:a6586cb660dc
user:        Benjamin Peterson <benjamin at python.org>
date:        Mon Jun 27 09:16:23 2011 -0500
summary:
  merge heads

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
@@ -912,7 +912,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