extmod/moductypes: Use mp_obj_is_dict_or_ordereddict to simplify code.
@@ -160,11 +160,7 @@ STATIC void uctypes_struct_print(const mp_print_t *print, mp_obj_t self_in, mp_p
(void)kind;
mp_obj_uctypes_struct_t *self = MP_OBJ_TO_PTR(self_in);
const char *typen = "unk";
- if (mp_obj_is_type(self->desc, &mp_type_dict)
- #if MICROPY_PY_COLLECTIONS_ORDEREDDICT
- || mp_obj_is_type(self->desc, &mp_type_ordereddict)
- #endif
- ) {
+ if (mp_obj_is_dict_or_ordereddict(self->desc)) {
typen = "STRUCT";
} else if (mp_obj_is_type(self->desc, &mp_type_tuple)) {
mp_obj_tuple_t *t = MP_OBJ_TO_PTR(self->desc);
@@ -258,11 +254,7 @@ STATIC mp_uint_t uctypes_struct_agg_size(mp_obj_tuple_t *t, int layout_type, mp_
}
STATIC mp_uint_t uctypes_struct_size(mp_obj_t desc_in, int layout_type, mp_uint_t *max_align, mp_uint_t *offset_to_set) {
- if (!mp_obj_is_type(desc_in, &mp_type_dict)
- #if MICROPY_PY_COLLECTIONS_ORDEREDDICT
- && !mp_obj_is_type(desc_in, &mp_type_ordereddict)
- #endif
- ) {
+ if (!mp_obj_is_dict_or_ordereddict(desc_in)) {
if (mp_obj_is_type(desc_in, &mp_type_tuple)) {
return uctypes_struct_agg_size((mp_obj_tuple_t *)MP_OBJ_TO_PTR(desc_in), layout_type, max_align, offset_to_set);
} else if (mp_obj_is_small_int(desc_in)) {
@@ -508,11 +500,7 @@ STATIC void set_aligned(uint val_type, void *p, mp_int_t index, mp_obj_t val) {
STATIC mp_obj_t uctypes_struct_attr_op(mp_obj_t self_in, qstr attr, mp_obj_t set_val) {
mp_obj_uctypes_struct_t *self = MP_OBJ_TO_PTR(self_in);
- if (!mp_obj_is_type(self->desc, &mp_type_dict)
- #if MICROPY_PY_COLLECTIONS_ORDEREDDICT
- && !mp_obj_is_type(self->desc, &mp_type_ordereddict)
- #endif
- ) {
+ if (!mp_obj_is_dict_or_ordereddict(self->desc)) {
mp_raise_TypeError(MP_ERROR_TEXT("struct: no fields"));
}
