djsundog
/
circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stream: Handle non-blocking errors in readline() properly. 

Just like they handled in other read*(). Note that behavior of readline()
in case there's no data when it's called is underspecified in Python lib
spec, implemented to behave as read() - return None.
This commit is contained in:
Paul Sokolovsky 2014-10-16 12:22:52 +03:00
parent 0c7b26c0f8
commit 923a8a8320
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
py/stream.c
View File

@ -293,9 +293,24 @@ STATIC mp_obj_t stream_unbuffered_readline(uint n_args, const mp_obj_t *args) {
mp_uint_t out_sz = o->type->stream_p->read(o, p, 1, &error); mp_uint_t out_sz = o->type->stream_p->read(o, p, 1, &error);
if (out_sz == MP_STREAM_ERROR) { if (out_sz == MP_STREAM_ERROR) {
if (is_nonblocking_error(error)) {
if (vstr->len == 1) {
// We just incremented it, but otherwise we read nothing
// and immediately got EAGAIN. This is case is not well
// specified in
// https://docs.python.org/3/library/io.html#io.IOBase.readline
// unlike similar case for read(). But we follow the latter's
// behavior - return None.
vstr_free(vstr);
return mp_const_none;
} else {
goto done;
}
}
nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(error))); nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(error)));
} }
if (out_sz == 0) { if (out_sz == 0) {
done:
// Back out previously added byte // Back out previously added byte
// Consider, what's better - read a char and get OutOfMemory (so read // Consider, what's better - read a char and get OutOfMemory (so read
// char is lost), or allocate first as we do. // char is lost), or allocate first as we do.