Skip to content

unix/moduselect: poll.unregister: Add optional throw=True param. #4217

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

unix/moduselect: poll.unregister: Add optional throw=True param. #4217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
41e0cde
unix/moduselect: poll.unregister: Add optional throw=True param.
pfalcon Oct 4, 2018
fcec4c2
tests/extmod/uselect_poll_basic: Test unregister() on stream not in p…
pfalcon Oct 4, 2018
d98a992
tests/uselect_poll_unreg: Test for throw=False arg for poll.unregiste…
pfalcon Oct 6, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions ports/unix/moduselect.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,10 @@ STATIC mp_obj_t poll_register(size_t n_args, const mp_obj_t *args) {
MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(poll_register_obj, 2, 3, poll_register);

/// \method unregister(obj)
STATIC mp_obj_t poll_unregister(mp_obj_t self_in, mp_obj_t obj_in) {
STATIC mp_obj_t poll_unregister(size_t n_args, const mp_obj_t *args) {
mp_obj_t self_in = args[0];
mp_obj_t obj_in = args[1];

mp_obj_poll_t *self = MP_OBJ_TO_PTR(self_in);
struct pollfd *entries = self->entries;
int fd = get_fd(obj_in);
Expand All @@ -140,15 +143,19 @@ STATIC mp_obj_t poll_unregister(mp_obj_t self_in, mp_obj_t obj_in) {
if (self->obj_map) {
self->obj_map[entries - self->entries] = MP_OBJ_NULL;
}
break;
return mp_const_true;
}
entries++;
}

// TODO raise KeyError if obj didn't exist in map
return mp_const_none;
// If "throw" arg if False, don't raise exception.
if (n_args > 2 && args[2] == mp_const_false) {
return mp_const_false;
}

mp_raise_msg(&mp_type_KeyError, NULL);
}
MP_DEFINE_CONST_FUN_OBJ_2(poll_unregister_obj, poll_unregister);
MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(poll_unregister_obj, 2, 3, poll_unregister);

/// \method modify(obj, eventmask)
STATIC mp_obj_t poll_modify(mp_obj_t self_in, mp_obj_t obj_in, mp_obj_t eventmask_in) {
Expand Down
5 changes: 5 additions & 0 deletions tests/extmod/uselect_poll_basic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,8 @@
poller.modify(s, select.POLLIN)
except OSError as e:
assert e.args[0] == errno.ENOENT

try:
poller.unregister(s)
except KeyError:
print("KeyError")
19 changes: 19 additions & 0 deletions tests/extmod/uselect_poll_unreg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# Test MicroPython's idempotent extension to poll.unregister().
try:
import usocket as socket, uselect as select, uerrno as errno
except ImportError:
print("SKIP")
raise SystemExit


poller = select.poll()

s = socket.socket()

poller.register(s)

print(poller.unregister(s, False))

# Can unregister multiple times
print(poller.unregister(s, False))
print(poller.unregister(s, False))
3 changes: 3 additions & 0 deletions tests/extmod/uselect_poll_unreg.py.exp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
True
False
False