mirrors/cpython
0
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2024-11-24 18:34:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

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:01 +02:00
parent 258e4d372f
commit 3ad2d70947
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Lib/test/test_poll.py
View File

@ -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)

2
Misc/NEWS
View File

@ -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.

5
Modules/selectmodule.c
View File

@ -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;
}