diff options
| -rw-r--r-- | Lib/test/test_poll.py | 4 | ||||
| -rw-r--r-- | Misc/NEWS | 2 | ||||
| -rw-r--r-- | 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 index f98a280..e51e6f0 100644 --- a/Lib/test/test_poll.py +++ b/Lib/test/test_poll.py @@ -161,10 +161,6 @@ class PollTests(unittest.TestCase): 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) @@ -29,6 +29,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 index 603a2b6..1bccc5f 100644 --- a/Modules/selectmodule.c +++ b/Modules/selectmodule.c @@ -380,11 +380,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; } |