commit 203b10703e5df20939b88a2ce29bb961cce7e4b6
author Damien George <damien.p.george@gmail.com> Fri May 29 10:28:38 2020 +1000
committer Damien George <damien.p.george@gmail.com> Tue Jun 02 15:42:20 2020 +1000
tree c7d9b303ed56097b1b0cd3ddd09f0218a4ec331b
parent da71f55e23a97102d241481e410fdb22d7c55758

py/modbuiltins: Fix getattr to work with class raising AttributeError.

Fixes issue #6089.

py/modbuiltins.c

diff --git a/py/modbuiltins.c b/py/modbuiltins.c
index 85d30ab..cfbfc5a 100644
--- a/py/modbuiltins.c
+++ b/py/modbuiltins.c
@@ -558,7 +558,11 @@
 static inline mp_obj_t mp_load_attr_default(mp_obj_t base, qstr attr, mp_obj_t defval) {
     mp_obj_t dest[2];
     // use load_method, raising or not raising exception
-    ((defval == MP_OBJ_NULL) ? mp_load_method : mp_load_method_maybe)(base, attr, dest);
+    if (defval == MP_OBJ_NULL) {
+        mp_load_method(base, attr, dest);
+    } else {
+        mp_load_method_protected(base, attr, dest, false);
+    }
     if (dest[0] == MP_OBJ_NULL) {
         return defval;
     } else if (dest[1] == MP_OBJ_NULL) {