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

py/objexcept: Don't convert errno to str in constructor, do it in print.

Browse Source 
OSError's are now printed like:

    OSError: [Errno 1] EPERM

but only if the string corresponding to the errno is found.
This commit is contained in:
Damien George 2016-05-12 14:27:52 +01:00
parent a314b842bb
commit 9a92499641
3 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
py/moduerrno.c
View File

@ -89,12 +89,12 @@ const mp_obj_module_t mp_module_uerrno = {
.globals = (mp_obj_dict_t*)&mp_module_uerrno_globals,
};
mp_obj_t mp_errno_to_str(mp_obj_t errno_val) {
qstr mp_errno_to_str(mp_obj_t errno_val) {
mp_map_elem_t *elem = mp_map_lookup((mp_map_t*)&errorcode_dict.map, errno_val, MP_MAP_LOOKUP);
if (elem == NULL) {
return errno_val;
return MP_QSTR_NULL;
} else {
return elem->value;
return MP_OBJ_QSTR_VALUE(elem->value);
}
}

4
py/mperrno.h
View File

@ -135,9 +135,7 @@
#endif
#if MICROPY_PY_UERRNO
mp_obj_t mp_errno_to_str(mp_obj_t errno_val);
#else
static inline mp_obj_t mp_errno_to_str(mp_obj_t errno_val) { return errno_val; }
qstr mp_errno_to_str(mp_obj_t errno_val);
#endif
#endif // __MICROPY_INCLUDED_PY_MPERRNO_H__

14
py/objexcept.c
View File

@ -108,6 +108,16 @@ STATIC void mp_obj_exception_print(const mp_print_t *print, mp_obj_t o_in, mp_pr
mp_print_str(print, "");
return;
} else if (o->args->len == 1) {
#if MICROPY_PY_UERRNO
// try to provide a nice OSError error message
if (o->base.type == &mp_type_OSError && MP_OBJ_IS_SMALL_INT(o->args->items[0])) {
qstr qst = mp_errno_to_str(o->args->items[0]);
if (qst != MP_QSTR_NULL) {
mp_printf(print, "[Errno %d] %q", MP_OBJ_SMALL_INT_VALUE(o->args->items[0]), qst);
return;
}
}
#endif
mp_obj_print_helper(print, o->args->items[0], PRINT_STR);
return;
}
@ -289,10 +299,6 @@ mp_obj_t mp_obj_new_exception(const mp_obj_type_t *exc_type) {
// "Optimized" version for common(?) case of having 1 exception arg
mp_obj_t mp_obj_new_exception_arg1(const mp_obj_type_t *exc_type, mp_obj_t arg) {
// try to provide a nice string instead of numeric value for errno's
if (exc_type == &mp_type_OSError && MP_OBJ_IS_SMALL_INT(arg)) {
arg = mp_errno_to_str(arg);
}
return mp_obj_new_exception_args(exc_type, 1, &arg);
}