py/objboundmeth: Support __func__ property as in CPython

notro · notro · commit b897603cfa6f · 2018-10-07T19:36:24.000+02:00
This gives access to the function underlying the bound method.

Used in the converted CPython stdlib logging.Formatter class to handle
overrriding a default converter method bound to a class variable.
The method becomes bound when accessed from an instance of that class.

I didn't investigate why CircuitPython turns it into a bound method.
diff --git a/py/objboundmeth.c b/py/objboundmeth.c
@@ -92,6 +92,9 @@ STATIC void bound_meth_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
     if (attr == MP_QSTR___name__) {
         mp_obj_bound_meth_t *o = MP_OBJ_TO_PTR(self_in);
         dest[0] = MP_OBJ_NEW_QSTR(mp_obj_fun_get_name(o->meth));
+    } else if (attr == MP_QSTR___func__) {
+        mp_obj_bound_meth_t *o = MP_OBJ_TO_PTR(self_in);
+        dest[0] = o->meth;
     }
 }
 #endif

Original file line number	Diff line number	Diff line change
`@@ -92,6 +92,9 @@ STATIC void bound_meth_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {`
`92`	`92`	`if (attr == MP_QSTR___name__) {`
`93`	`93`	`mp_obj_bound_meth_t *o = MP_OBJ_TO_PTR(self_in);`
`94`	`94`	`dest[0] = MP_OBJ_NEW_QSTR(mp_obj_fun_get_name(o->meth));`
	`95`	`+ } else if (attr == MP_QSTR___func__) {`
	`96`	`+ mp_obj_bound_meth_t *o = MP_OBJ_TO_PTR(self_in);`
	`97`	`+ dest[0] = o->meth;`
`95`	`98`	`}`
`96`	`99`	`}`
`97`	`100`	`#endif`