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

Fixes issue #6089.

1 files changed, 12 insertions, 0 deletions

diff --git a/tests/basics/builtin_getattr.py b/tests/basics/builtin_getattr.py
index 59cb7e7f7a..afa4ab3293 100644
--- a/tests/basics/builtin_getattr.py
+++ b/tests/basics/builtin_getattr.py
@@ -16,3 +16,15 @@ print(getattr(a, "meth")(5))
 print(getattr(a, "_none_such", 123))
 print(getattr(list, "foo", 456))
 print(getattr(a, "va" + "r2"))
+
+# test a class that defines __getattr__ and may raise AttributeError
+class B:
+    def __getattr__(self, attr):
+        if attr == "a":
+            return attr
+        else:
+            raise AttributeError
+b = B()
+print(getattr(b, "a"))
+print(getattr(b, "a", "default"))
+print(getattr(b, "b", "default"))