diff options
| author | Damien George <damien.p.george@gmail.com> | 2017-02-22 15:08:32 +1100 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2017-02-22 15:08:32 +1100 |
| commit | 047af9b10bfc6b0ec412f8450c6bec10ab95254b (patch) | |
| tree | ea5131c4c506a4af33c1498a35540ec24f8bb91a | |
| parent | d03f089baa674e046da10891be338d14346f8a3a (diff) | |
| download | micropython-047af9b10bfc6b0ec412f8450c6bec10ab95254b.tar.gz micropython-047af9b10bfc6b0ec412f8450c6bec10ab95254b.zip | |
cc3200: Remove socket.timeout class, use OSError(ETIMEDOUT) instead.
socket.timeout is a subclass of OSError, and using the latter is more
efficient than having a dedicated class. The argument of OSError is
ETIMEDOUT so the error can be distinguished from other kinds of
OSErrors. This follows how the esp8266 port does it.
| -rw-r--r-- | cc3200/mods/modusocket.c | 7 | ||||
| -rw-r--r-- | cc3200/mpconfigport.h | 1 |
2 files changed, 2 insertions, 6 deletions
diff --git a/cc3200/mods/modusocket.c b/cc3200/mods/modusocket.c index 82a85e8a2c..02ce3e2796 100644 --- a/cc3200/mods/modusocket.c +++ b/cc3200/mods/modusocket.c @@ -520,7 +520,7 @@ STATIC mp_obj_t socket_recv(mp_obj_t self_in, mp_obj_t len_in) { mp_int_t ret = wlan_socket_recv(self, (byte*)vstr.buf, len, &_errno); if (ret < 0) { if (_errno == MP_EAGAIN && self->sock_base.has_timeout) { - mp_raise_msg(&mp_type_TimeoutError, "timed out"); + mp_raise_OSError(MP_ETIMEDOUT); } mp_raise_OSError(-_errno); } @@ -566,7 +566,7 @@ STATIC mp_obj_t socket_recvfrom(mp_obj_t self_in, mp_obj_t len_in) { mp_int_t ret = wlan_socket_recvfrom(self, (byte*)vstr.buf, vstr.len, ip, &port, &_errno); if (ret < 0) { if (_errno == MP_EAGAIN && self->sock_base.has_timeout) { - mp_raise_msg(&mp_type_TimeoutError, "timed out"); + mp_raise_OSError(MP_ETIMEDOUT); } mp_raise_OSError(-_errno); } @@ -763,9 +763,6 @@ STATIC const mp_map_elem_t mp_module_usocket_globals_table[] = { { MP_OBJ_NEW_QSTR(MP_QSTR_socket), (mp_obj_t)&socket_type }, { MP_OBJ_NEW_QSTR(MP_QSTR_getaddrinfo), (mp_obj_t)&mod_usocket_getaddrinfo_obj }, - // class exceptions - { MP_OBJ_NEW_QSTR(MP_QSTR_timeout), (mp_obj_t)&mp_type_TimeoutError }, - // class constants { MP_OBJ_NEW_QSTR(MP_QSTR_AF_INET), MP_OBJ_NEW_SMALL_INT(SL_AF_INET) }, diff --git a/cc3200/mpconfigport.h b/cc3200/mpconfigport.h index ad1e8ef2bb..a8dc0cfeb8 100644 --- a/cc3200/mpconfigport.h +++ b/cc3200/mpconfigport.h @@ -79,7 +79,6 @@ #define MICROPY_VFS (1) #define MICROPY_VFS_FAT (1) #define MICROPY_PY_ASYNC_AWAIT (0) -#define MICROPY_PY_BUILTINS_TIMEOUTERROR (1) #define MICROPY_PY_ALL_SPECIAL_METHODS (1) #define MICROPY_PY_BUILTINS_HELP (1) #define MICROPY_PY_BUILTINS_HELP_TEXT cc3200_help_text |