[Python-checkins] cpython (merge 3.5 -> default): merge from 3.5

[senthil.kumaran]

https://hg.python.org/cpython/rev/eca161a355d4
changeset:   101341:eca161a355d4
parent:      101339:b8b2c5cc7e9d
parent:      101340:37c95a4b979a
user:        Senthil Kumaran <senthil at uthcode.com>
date:        Sat May 14 21:29:03 2016 -0700
summary:
  merge from 3.5

issue27018 - Fix the documentation of select.epoll.register method.

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
@@ -1438,7 +1438,7 @@
 Registers a new fd or raises an OSError 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\
+is EPOLLIN | EPOLLOUT | EPOLLPRI.\n\
 \n\
 The epoll interface supports all file descriptors that support poll.");
 

-- 
Repository URL: https://hg.python.org/cpython