extmod/modselect: Remove undocumented support for flags arg to poll.

The signature of this method was poller.poll(timeout=-1, flags=0, /) but
the flags argument was not documented and is not CPython compatible.  So
it's removed in this commit.

(The optional flags remains for the ipoll() method, which is documented.)

Signed-off-by: Damien George <damien@micropython.org>
pull/12138/head
Damien George 2023-08-02 10:04:13 +10:00
rodzic ef71028f77
commit 3f417e8943
1 zmienionych plików z 2 dodań i 6 usunięć

Wyświetl plik

@ -58,7 +58,7 @@
#endif #endif
// Flags for poll() // Flags for ipoll()
#define FLAG_ONESHOT (1) #define FLAG_ONESHOT (1)
// A single pollable object. // A single pollable object.
@ -524,15 +524,11 @@ STATIC mp_obj_t poll_poll(size_t n_args, const mp_obj_t *args) {
if (poll_obj_get_revents(poll_obj) != 0) { if (poll_obj_get_revents(poll_obj) != 0) {
mp_obj_t tuple[2] = {poll_obj->obj, MP_OBJ_NEW_SMALL_INT(poll_obj_get_revents(poll_obj))}; mp_obj_t tuple[2] = {poll_obj->obj, MP_OBJ_NEW_SMALL_INT(poll_obj_get_revents(poll_obj))};
ret_list->items[n_ready++] = mp_obj_new_tuple(2, tuple); ret_list->items[n_ready++] = mp_obj_new_tuple(2, tuple);
if (self->flags & FLAG_ONESHOT) {
// Don't poll next time, until new event mask will be set explicitly
poll_obj_set_events(poll_obj, 0);
}
} }
} }
return MP_OBJ_FROM_PTR(ret_list); return MP_OBJ_FROM_PTR(ret_list);
} }
MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(poll_poll_obj, 1, 3, poll_poll); MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(poll_poll_obj, 1, 2, poll_poll);
STATIC mp_obj_t poll_ipoll(size_t n_args, const mp_obj_t *args) { STATIC mp_obj_t poll_ipoll(size_t n_args, const mp_obj_t *args) {
mp_obj_poll_t *self = MP_OBJ_TO_PTR(args[0]); mp_obj_poll_t *self = MP_OBJ_TO_PTR(args[0]);