py: Rework mp_convert_member_lookup to properly handle built-ins.

This commit fixes lookups of class members to make it so that built-in
functions that are used as methods/functions of a class work correctly.

The mp_convert_member_lookup() function is pretty much completely changed
by this commit, but for the most part it's just reorganised and the
indenting changed.  The functional changes are:

- staticmethod and classmethod checks moved to later in the if-logic,
  because they are less common and so should be checked after the more
  common cases.

- The explicit mp_obj_is_type(member, &mp_type_type) check is removed
  because it's now subsumed by other, more general tests in this function.

- MP_TYPE_FLAG_BINDS_SELF and MP_TYPE_FLAG_BUILTIN_FUN type flags added to
  make the checks in this function much simpler (now they just test this
  bit in type->flags).

- An extra check is made for mp_obj_is_instance_type(type) to fix lookup of
  built-in functions.

Fixes #1326 and #6198.

Signed-off-by: Damien George <damien@micropython.org>

1 files changed, 8 insertions, 1 deletions

diff --git a/tests/basics/class_bind_self.py b/tests/basics/class_bind_self.py
index 16e4f5ac9..813f87644 100644
--- a/tests/basics/class_bind_self.py
+++ b/tests/basics/class_bind_self.py
@@ -40,11 +40,18 @@ print(c.f2(2))
 print(c.f3())
 print(next(c.f4(4)))
 print(c.f5(5))
-#print(c.f6(-6)) not working in uPy
+print(c.f6(-6))
 print(c.f7(7))
 print(c.f8(8))
 print(c.f9(9))
 
+# test calling the functions accessed via the class itself
+print(C.f5(10))
+print(C.f6(-11))
+print(C.f7(12))
+print(C.f8(13))
+print(C.f9(14))
+
 # not working in uPy
 #class C(list):
 #    # this acts like a method and binds self