[Python-checkins] cpython (2.7): Issue #17919: select.poll.poll() again works with poll.POLLNVAL on AIX.

[serhiy.storchaka]

http://hg.python.org/cpython/rev/64f32a31cd49
changeset:   87930:64f32a31cd49
branch:      2.7
parent:      87922:aa324af42c0e
user:        Serhiy Storchaka <storchaka at gmail.com>
date:        Fri Dec 13 12:09:05 2013 +0200
summary:
  Issue #17919: select.poll.poll() again works with poll.POLLNVAL on AIX.

files:
  Lib/test/test_poll.py  |  4 ----
  Misc/NEWS              |  2 ++
  Modules/selectmodule.c |  5 ++---
  3 files changed, 4 insertions(+), 7 deletions(-)


diff --git a/Lib/test/test_poll.py b/Lib/test/test_poll.py
--- a/Lib/test/test_poll.py
+++ b/Lib/test/test_poll.py
@@ -161,10 +161,6 @@
 
         pollster = select.poll()
         # Issue 15989
-        self.assertRaises(OverflowError, pollster.register, 0,
-                          _testcapi.SHRT_MAX + 1)
-        self.assertRaises(OverflowError, pollster.register, 0,
-                          _testcapi.USHRT_MAX + 1)
         self.assertRaises(OverflowError, pollster.poll, _testcapi.INT_MAX + 1)
         self.assertRaises(OverflowError, pollster.poll, _testcapi.UINT_MAX + 1)
 
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -23,6 +23,8 @@
 Library
 -------
 
+- Issue #17919: select.poll.poll() again works with poll.POLLNVAL on AIX.
+
 - Issue #17200: telnetlib's read_until and expect timeout was broken by the
   fix to Issue #14635 in Python 2.7.4 to be interpreted as milliseconds
   instead of seconds when the platform supports select.poll (ie: everywhere).
diff --git a/Modules/selectmodule.c b/Modules/selectmodule.c
--- a/Modules/selectmodule.c
+++ b/Modules/selectmodule.c
@@ -366,11 +366,10 @@
 poll_register(pollObject *self, PyObject *args)
 {
     PyObject *o, *key, *value;
-    int fd;
-    short events = POLLIN | POLLPRI | POLLOUT;
+    int fd, events = POLLIN | POLLPRI | POLLOUT;
     int err;
 
-    if (!PyArg_ParseTuple(args, "O|h:register", &o, &events)) {
+    if (!PyArg_ParseTuple(args, "O|i:register", &o, &events)) {
         return NULL;
     }
 

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