py: Implement __dict__ for instances.
Note that even though wrapped in MICROPY_CPYTHON_COMPAT, it is not fully compatible because the modifications to the dictionary do not propagate to the actual instance members.
This commit is contained in:
parent
7281d95aee
commit
3c014a67ea
17
py/objtype.c
17
py/objtype.c
@ -472,7 +472,22 @@ STATIC void mp_obj_instance_load_attr(mp_obj_t self_in, qstr attr, mp_obj_t *des
|
||||
dest[0] = elem->value;
|
||||
return;
|
||||
}
|
||||
|
||||
#if MICROPY_CPYTHON_COMPAT
|
||||
if (attr == MP_QSTR___dict__) {
|
||||
// Create a new dict with a copy of the instance's map items.
|
||||
// This creates, unlike CPython, a 'read-only' __dict__: modifying
|
||||
// it will not result in modifications to the actual instance members.
|
||||
mp_map_t *map = &self->members;
|
||||
mp_obj_t attr_dict = mp_obj_new_dict(map->used);
|
||||
for (mp_uint_t i = 0; i < map->alloc; ++i) {
|
||||
if (MP_MAP_SLOT_IS_FILLED(map, i)) {
|
||||
mp_obj_dict_store(attr_dict, map->table[i].key, map->table[i].value);
|
||||
}
|
||||
}
|
||||
dest[0] = attr_dict;
|
||||
return;
|
||||
}
|
||||
#endif
|
||||
struct class_lookup_data lookup = {
|
||||
.obj = self,
|
||||
.attr = attr,
|
||||
|
@ -46,6 +46,7 @@ Q(__locals__)
|
||||
Q(__main__)
|
||||
Q(__module__)
|
||||
Q(__name__)
|
||||
Q(__dict__)
|
||||
Q(__hash__)
|
||||
Q(__next__)
|
||||
Q(__qualname__)
|
||||
|
11
tests/basics/builtin_dict.py
Normal file
11
tests/basics/builtin_dict.py
Normal file
@ -0,0 +1,11 @@
|
||||
class A:
|
||||
def __init__(self):
|
||||
self.a=1
|
||||
self.b=2
|
||||
|
||||
try:
|
||||
d=A().__dict__
|
||||
print(d['a'])
|
||||
print(d['b'])
|
||||
except AttributeError:
|
||||
print("SKIP")
|
Loading…
Reference in New Issue
Block a user