mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

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

Browse source
This commit is contained in:
Serhiy Storchaka 2013-12-13 12:08:55 +02:00
commit cb1c4c8c22
3 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Lib/test/test_poll.py
View file

@ -163,10 +163,6 @@ class PollTests(unittest.TestCase):
pollster = select.poll() pollster = select.poll()
# Issue 15989 # 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.INT_MAX + 1)
self.assertRaises(OverflowError, pollster.poll, _testcapi.UINT_MAX + 1) self.assertRaises(OverflowError, pollster.poll, _testcapi.UINT_MAX + 1)

2
Misc/NEWS
View file

@ -37,6 +37,8 @@ Core and Builtins
Library 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 - Issue #19063: if a Charset's body_encoding was set to None, the email
package would generate a message claiming the Content-Transfer-Encoding package would generate a message claiming the Content-Transfer-Encoding
was 7bit, and produce garbage output for the content. This now works. was 7bit, and produce garbage output for the content. This now works.

5
Modules/selectmodule.c
View file

@ -375,11 +375,10 @@ static PyObject *
poll_register(pollObject *self, PyObject *args) poll_register(pollObject *self, PyObject *args)
{ {
PyObject *o, *key, *value; PyObject *o, *key, *value;
int fd; int fd, events = POLLIN | POLLPRI | POLLOUT;
short events = POLLIN | POLLPRI | POLLOUT;
int err; int err;
if (!PyArg_ParseTuple(args, "O|h:register", &o, &events)) { if (!PyArg_ParseTuple(args, "O|i:register", &o, &events)) {
return NULL; return NULL;
} }