mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-07 07:31:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

bpo-31938: Fix default-value signatures of several functions in the select module (GH-21066)

Browse source
This commit is contained in:
Anthony Sottile 2020-06-23 14:49:56 -07:00 • committed by GitHub
parent 281cce1106
commit d051801052
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Misc/NEWS.d/next/Library/2020-06-22-20-08-40.bpo-31938.EVuko9.rst Normal file
View file

@ -0,0 +1 @@
Fix default-value signatures of several functions in the :mod:`select` module - by Anthony Sottile.

14
Modules/clinic/selectmodule.c.h generated
View file

@ -65,7 +65,8 @@ exit:
#if (defined(HAVE_POLL) && !defined(HAVE_BROKEN_POLL)) #if (defined(HAVE_POLL) && !defined(HAVE_BROKEN_POLL))
PyDoc_STRVAR(select_poll_register__doc__, PyDoc_STRVAR(select_poll_register__doc__,
"register($self, fd, eventmask=POLLIN | POLLPRI | POLLOUT, /)\n" "register($self, fd,\n"
" eventmask=select.POLLIN | select.POLLPRI | select.POLLOUT, /)\n"
"--\n" "--\n"
"\n" "\n"
"Register a file descriptor with the polling object.\n" "Register a file descriptor with the polling object.\n"
@ -226,7 +227,8 @@ exit:
#if (defined(HAVE_POLL) && !defined(HAVE_BROKEN_POLL)) && defined(HAVE_SYS_DEVPOLL_H) #if (defined(HAVE_POLL) && !defined(HAVE_BROKEN_POLL)) && defined(HAVE_SYS_DEVPOLL_H)
PyDoc_STRVAR(select_devpoll_register__doc__, PyDoc_STRVAR(select_devpoll_register__doc__,
"register($self, fd, eventmask=POLLIN | POLLPRI | POLLOUT, /)\n" "register($self, fd,\n"
" eventmask=select.POLLIN | select.POLLPRI | select.POLLOUT, /)\n"
"--\n" "--\n"
"\n" "\n"
"Register a file descriptor with the polling object.\n" "Register a file descriptor with the polling object.\n"
@ -275,7 +277,8 @@ exit:
#if (defined(HAVE_POLL) && !defined(HAVE_BROKEN_POLL)) && defined(HAVE_SYS_DEVPOLL_H) #if (defined(HAVE_POLL) && !defined(HAVE_BROKEN_POLL)) && defined(HAVE_SYS_DEVPOLL_H)
PyDoc_STRVAR(select_devpoll_modify__doc__, PyDoc_STRVAR(select_devpoll_modify__doc__,
"modify($self, fd, eventmask=POLLIN | POLLPRI | POLLOUT, /)\n" "modify($self, fd,\n"
" eventmask=select.POLLIN | select.POLLPRI | select.POLLOUT, /)\n"
"--\n" "--\n"
"\n" "\n"
"Modify a possible already registered file descriptor.\n" "Modify a possible already registered file descriptor.\n"
@ -630,7 +633,8 @@ exit:
#if defined(HAVE_EPOLL) #if defined(HAVE_EPOLL)
PyDoc_STRVAR(select_epoll_register__doc__, PyDoc_STRVAR(select_epoll_register__doc__,
"register($self, /, fd, eventmask=EPOLLIN | EPOLLPRI | EPOLLOUT)\n" "register($self, /, fd,\n"
" eventmask=select.EPOLLIN | select.EPOLLPRI | select.EPOLLOUT)\n"
"--\n" "--\n"
"\n" "\n"
"Registers a new fd or raises an OSError if the fd is already registered.\n" "Registers a new fd or raises an OSError if the fd is already registered.\n"
@ -1175,4 +1179,4 @@ exit:
#ifndef SELECT_KQUEUE_CONTROL_METHODDEF #ifndef SELECT_KQUEUE_CONTROL_METHODDEF
#define SELECT_KQUEUE_CONTROL_METHODDEF #define SELECT_KQUEUE_CONTROL_METHODDEF
#endif /* !defined(SELECT_KQUEUE_CONTROL_METHODDEF) */ #endif /* !defined(SELECT_KQUEUE_CONTROL_METHODDEF) */
/*[clinic end generated code: output=a055330869acbd16 input=a9049054013a1b77]*/ /*[clinic end generated code: output=7144233c42e18279 input=a9049054013a1b77]*/

16
Modules/selectmodule.c
View file

@ -458,7 +458,7 @@ select.poll.register
fd: fildes fd: fildes
either an integer, or an object with a fileno() method returning an int either an integer, or an object with a fileno() method returning an int
eventmask: unsigned_short(c_default="POLLIN | POLLPRI | POLLOUT") = POLLIN | POLLPRI | POLLOUT eventmask: unsigned_short(c_default="POLLIN | POLLPRI | POLLOUT") = select.POLLIN | select.POLLPRI | select.POLLOUT
an optional bitmask describing the type of events to check for an optional bitmask describing the type of events to check for
/ /
@ -467,7 +467,7 @@ Register a file descriptor with the polling object.
static PyObject * static PyObject *
select_poll_register_impl(pollObject *self, int fd, unsigned short eventmask) select_poll_register_impl(pollObject *self, int fd, unsigned short eventmask)
/*[clinic end generated code: output=0dc7173c800a4a65 input=f18711d9bb021e25]*/ /*[clinic end generated code: output=0dc7173c800a4a65 input=34e16cfb28d3c900]*/
{ {
PyObject *key, *value; PyObject *key, *value;
int err; int err;
@ -845,7 +845,7 @@ select.devpoll.register
fd: fildes fd: fildes
either an integer, or an object with a fileno() method returning either an integer, or an object with a fileno() method returning
an int an int
eventmask: unsigned_short(c_default="POLLIN | POLLPRI | POLLOUT") = POLLIN | POLLPRI | POLLOUT eventmask: unsigned_short(c_default="POLLIN | POLLPRI | POLLOUT") = select.POLLIN | select.POLLPRI | select.POLLOUT
an optional bitmask describing the type of events to check for an optional bitmask describing the type of events to check for
/ /
@ -855,7 +855,7 @@ Register a file descriptor with the polling object.
static PyObject * static PyObject *
select_devpoll_register_impl(devpollObject *self, int fd, select_devpoll_register_impl(devpollObject *self, int fd,
unsigned short eventmask) unsigned short eventmask)
/*[clinic end generated code: output=6e07fe8b74abba0c input=5bd7cacc47a8ee46]*/ /*[clinic end generated code: output=6e07fe8b74abba0c input=22006fabe9567522]*/
{ {
return internal_devpoll_register(self, fd, eventmask, 0); return internal_devpoll_register(self, fd, eventmask, 0);
} }
@ -866,7 +866,7 @@ select.devpoll.modify
fd: fildes fd: fildes
either an integer, or an object with a fileno() method returning either an integer, or an object with a fileno() method returning
an int an int
eventmask: unsigned_short(c_default="POLLIN | POLLPRI | POLLOUT") = POLLIN | POLLPRI | POLLOUT eventmask: unsigned_short(c_default="POLLIN | POLLPRI | POLLOUT") = select.POLLIN | select.POLLPRI | select.POLLOUT
an optional bitmask describing the type of events to check for an optional bitmask describing the type of events to check for
/ /
@ -876,7 +876,7 @@ Modify a possible already registered file descriptor.
static PyObject * static PyObject *
select_devpoll_modify_impl(devpollObject *self, int fd, select_devpoll_modify_impl(devpollObject *self, int fd,
unsigned short eventmask) unsigned short eventmask)
/*[clinic end generated code: output=bc2e6d23aaff98b4 input=48a820fc5967165d]*/ /*[clinic end generated code: output=bc2e6d23aaff98b4 input=09fa335db7cdc09e]*/
{ {
return internal_devpoll_register(self, fd, eventmask, 1); return internal_devpoll_register(self, fd, eventmask, 1);
} }
@ -1475,7 +1475,7 @@ select.epoll.register
fd: fildes fd: fildes
the target file descriptor of the operation the target file descriptor of the operation
eventmask: unsigned_int(c_default="EPOLLIN | EPOLLPRI | EPOLLOUT", bitwise=True) = EPOLLIN | EPOLLPRI | EPOLLOUT eventmask: unsigned_int(c_default="EPOLLIN | EPOLLPRI | EPOLLOUT", bitwise=True) = select.EPOLLIN | select.EPOLLPRI | select.EPOLLOUT
a bit set composed of the various EPOLL constants a bit set composed of the various EPOLL constants
Registers a new fd or raises an OSError if the fd is already registered. Registers a new fd or raises an OSError if the fd is already registered.
@ -1486,7 +1486,7 @@ The epoll interface supports all file descriptors that support poll.
static PyObject * static PyObject *
select_epoll_register_impl(pyEpoll_Object *self, int fd, select_epoll_register_impl(pyEpoll_Object *self, int fd,
unsigned int eventmask) unsigned int eventmask)
/*[clinic end generated code: output=318e5e6386520599 input=6cf699c152dd8ca9]*/ /*[clinic end generated code: output=318e5e6386520599 input=a5071b71edfe3578]*/
{ {
return pyepoll_internal_ctl(self->epfd, EPOLL_CTL_ADD, fd, eventmask); return pyepoll_internal_ctl(self->epfd, EPOLL_CTL_ADD, fd, eventmask);
} }