Issue #17919: select.poll.poll() again works with poll.POLLNVAL on AIX.

serhiy-storchaka · serhiy-storchaka · commit cb1c4c8c22e2 · 2013-12-13T12:08:55.000+02:00
diff --git a/Lib/test/test_poll.py b/Lib/test/test_poll.py
@@ -163,10 +163,6 @@ def test_poll3(self):
 
         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
@@ -37,6 +37,8 @@ Core and Builtins
 Library
 -------
 
+- Issue #17919: select.poll.poll() again works with poll.POLLNVAL on AIX.
+
 - Issue #19063: if a Charset's body_encoding was set to None, the email
   package would generate a message claiming the Content-Transfer-Encoding
   was 7bit, and produce garbage output for the content.  This now works.
diff --git a/Modules/selectmodule.c b/Modules/selectmodule.c
@@ -375,11 +375,10 @@ static PyObject *
 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;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -375,11 +375,10 @@ static PyObject *`
`375`	`375`	`poll_register(pollObject self, PyObject args)`
`376`	`376`	`{`
`377`	`377`	`PyObject o, key, *value;`
`378`		`- int fd;`
`379`		`- short events = POLLIN \| POLLPRI \| POLLOUT;`
	`378`	`+ int fd, events = POLLIN \| POLLPRI \| POLLOUT;`
`380`	`379`	`int err;`
`381`	`380`
`382`		`- if (!PyArg_ParseTuple(args, "O\|h:register", &o, &events)) {`
	`381`	`+ if (!PyArg_ParseTuple(args, "O\|i:register", &o, &events)) {`
`383`	`382`	`return NULL;`
`384`	`383`	`}`
`385`	`384`