Skip to content

Commit e62db5a

Browse files
committed
Fix native property setting from subclass
1 parent e1df598 commit e62db5a

File tree

103 files changed

+249
-97
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

103 files changed

+249
-97
lines changed

extmod/vfs_fat.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -540,7 +540,7 @@ STATIC const mp_vfs_proto_t fat_vfs_proto = {
540540
MP_DEFINE_CONST_OBJ_TYPE(
541541
mp_fat_vfs_type,
542542
MP_QSTR_VfsFat,
543-
MP_TYPE_FLAG_NONE,
543+
MP_TYPE_FLAG_HAS_SPECIAL_ACCESSORS,
544544
make_new, fat_vfs_make_new,
545545
protocol, &fat_vfs_proto,
546546
locals_dict, &fat_vfs_locals_dict

ports/atmel-samd/bindings/samd/Clock.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ STATIC MP_DEFINE_CONST_DICT(samd_clock_locals_dict, samd_clock_locals_dict_table
131131
MP_DEFINE_CONST_OBJ_TYPE(
132132
samd_clock_type,
133133
MP_QSTR_Clock,
134-
MP_TYPE_FLAG_NONE,
134+
MP_TYPE_FLAG_HAS_SPECIAL_ACCESSORS,
135135
print, samd_clock_print,
136136
locals_dict, &samd_clock_locals_dict
137137
);

ports/broadcom/bindings/videocore/Framebuffer.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ STATIC const framebuffer_p_t videocore_framebuffer_proto = {
172172
MP_DEFINE_CONST_OBJ_TYPE(
173173
videocore_framebuffer_type,
174174
MP_QSTR_Framebuffer,
175-
MP_TYPE_FLAG_NONE,
175+
MP_TYPE_FLAG_HAS_SPECIAL_ACCESSORS,
176176
locals_dict, (mp_obj_dict_t *)&videocore_framebuffer_locals_dict,
177177
make_new, videocore_framebuffer_make_new,
178178
buffer, common_hal_videocore_framebuffer_get_buffer,

ports/espressif/bindings/espcamera/Camera.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -995,7 +995,7 @@ STATIC MP_DEFINE_CONST_DICT(espcamera_camera_locals_dict, espcamera_camera_local
995995
MP_DEFINE_CONST_OBJ_TYPE(
996996
espcamera_camera_type,
997997
MP_QSTR_Camera,
998-
MP_TYPE_FLAG_NONE,
998+
MP_TYPE_FLAG_HAS_SPECIAL_ACCESSORS,
999999
make_new, espcamera_camera_make_new,
10001000
locals_dict, &espcamera_camera_locals_dict
10011001
);

ports/espressif/bindings/espnow/ESPNow.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@ STATIC mp_obj_t espnow_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
362362
MP_DEFINE_CONST_OBJ_TYPE(
363363
espnow_type,
364364
MP_QSTR_ESPNow,
365-
MP_TYPE_FLAG_NONE,
365+
MP_TYPE_FLAG_HAS_SPECIAL_ACCESSORS,
366366
make_new, espnow_make_new,
367367
locals_dict, &espnow_locals_dict,
368368
protocol, &espnow_stream_p,

ports/espressif/bindings/espnow/Peer.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ STATIC MP_DEFINE_CONST_DICT(espnow_peer_locals_dict, espnow_peer_locals_dict_tab
225225
MP_DEFINE_CONST_OBJ_TYPE(
226226
espnow_peer_type,
227227
MP_QSTR_Peer,
228-
MP_TYPE_FLAG_NONE,
228+
MP_TYPE_FLAG_HAS_SPECIAL_ACCESSORS,
229229
make_new, espnow_peer_make_new,
230230
locals_dict, &espnow_peer_locals_dict
231231
);

ports/espressif/bindings/espulp/ULP.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ STATIC MP_DEFINE_CONST_DICT(espulp_ulp_locals_dict, espulp_ulp_locals_table);
175175
MP_DEFINE_CONST_OBJ_TYPE(
176176
espulp_ulp_type,
177177
MP_QSTR_ULP,
178-
MP_TYPE_FLAG_NONE,
178+
MP_TYPE_FLAG_HAS_SPECIAL_ACCESSORS,
179179
make_new, espulp_ulp_make_new,
180180
locals_dict, &espulp_ulp_locals_dict
181181
);

ports/raspberrypi/bindings/picodvi/Framebuffer.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ STATIC const framebuffer_p_t picodvi_framebuffer_proto = {
251251
MP_DEFINE_CONST_OBJ_TYPE(
252252
picodvi_framebuffer_type,
253253
MP_QSTR_Framebuffer,
254-
MP_TYPE_FLAG_NONE,
254+
MP_TYPE_FLAG_HAS_SPECIAL_ACCESSORS,
255255
locals_dict, &picodvi_framebuffer_locals_dict,
256256
make_new, picodvi_framebuffer_make_new,
257257
buffer, common_hal_picodvi_framebuffer_get_buffer,

ports/raspberrypi/bindings/rp2pio/StateMachine.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -862,7 +862,7 @@ STATIC MP_DEFINE_CONST_DICT(rp2pio_statemachine_locals_dict, rp2pio_statemachine
862862
MP_DEFINE_CONST_OBJ_TYPE(
863863
rp2pio_statemachine_type,
864864
MP_QSTR_StateMachine,
865-
MP_TYPE_FLAG_NONE,
865+
MP_TYPE_FLAG_HAS_SPECIAL_ACCESSORS,
866866
make_new, rp2pio_statemachine_make_new,
867867
locals_dict, &rp2pio_statemachine_locals_dict
868868
);

ports/unix/main.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -593,6 +593,9 @@ MP_NOINLINE int main_(int argc, char **argv) {
593593
MP_DECLARE_CONST_FUN_OBJ_0(extra_cpp_coverage_obj);
594594
mp_store_global(MP_QSTR_extra_coverage, MP_OBJ_FROM_PTR(&extra_coverage_obj));
595595
mp_store_global(MP_QSTR_extra_cpp_coverage, MP_OBJ_FROM_PTR(&extra_cpp_coverage_obj));
596+
// CIRCUITPY-CHANGE: test native base classes work as needed by CircuitPython libraries.
597+
extern const mp_obj_type_t native_base_class_type;
598+
mp_store_global(MP_QSTR_NativeBaseClass, MP_OBJ_FROM_PTR(&native_base_class_type));
596599
}
597600
#endif
598601

0 commit comments

Comments
 (0)