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

py/modbuiltins: In built-in dir make use of mp_load_method_protected.

Browse Source 
This gives dir() better behaviour when listing the attributes of a user
type that defines __getattr__: it will now not list those attributes for
which __getattr__ raises AttributeError (meaning the attribute is not
supported by the object).
This commit is contained in:
Damien George 2018-05-10 23:07:19 +10:00
parent 7241d90272
commit 29d28c2574
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
py/modbuiltins.c
View File

@ -188,7 +188,7 @@ STATIC mp_obj_t mp_builtin_dir(size_t n_args, const mp_obj_t *args) {
size_t nqstr = QSTR_TOTAL(); size_t nqstr = QSTR_TOTAL();
for (size_t i = MP_QSTR_ + 1; i < nqstr; ++i) { for (size_t i = MP_QSTR_ + 1; i < nqstr; ++i) {
mp_obj_t dest[2]; mp_obj_t dest[2];
mp_load_method_maybe(args[0], i, dest); mp_load_method_protected(args[0], i, dest, false);
if (dest[0] != MP_OBJ_NULL) { if (dest[0] != MP_OBJ_NULL) {
mp_obj_list_append(dir, MP_OBJ_NEW_QSTR(i)); mp_obj_list_append(dir, MP_OBJ_NEW_QSTR(i));
} }