Skip to content

Commit dbbbbc7

Browse files
laurensvalkdlech
authored andcommitted
py/pbkwarg: update reference to none object
This follows:none micropython/micropython@d96cfd1
1 parent ec798b9 commit dbbbbc7

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

bricks/ev3dev/pb_type_ev3dev_font.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,12 +61,12 @@ void pb_type_ev3dev_Font_init() {
6161
STATIC mp_obj_t ev3dev_Font_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
6262
enum { ARG_family, ARG_size, ARG_bold, ARG_monospace, ARG_lang, ARG_script };
6363
static const mp_arg_t allowed_args[] = {
64-
{ MP_QSTR_family, MP_ARG_OBJ, {.u_rom_obj = MP_ROM_PTR(&mp_const_none_obj)} },
64+
{ MP_QSTR_family, MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
6565
{ MP_QSTR_size, MP_ARG_INT, {.u_int = 12} },
6666
{ MP_QSTR_bold, MP_ARG_BOOL, {.u_bool = FALSE} },
6767
{ MP_QSTR_monospace, MP_ARG_BOOL, {.u_bool = FALSE} },
68-
{ MP_QSTR_lang, MP_ARG_OBJ, {.u_rom_obj = MP_ROM_PTR(&mp_const_none_obj)} },
69-
{ MP_QSTR_script, MP_ARG_OBJ, {.u_rom_obj = MP_ROM_PTR(&mp_const_none_obj)} },
68+
{ MP_QSTR_lang, MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
69+
{ MP_QSTR_script, MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
7070
};
7171

7272
mp_arg_val_t arg_vals[MP_ARRAY_SIZE(allowed_args)];

bricks/ev3dev/pb_type_ev3dev_image.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,10 +95,10 @@ STATIC mp_obj_t ev3dev_Image_make_new(const mp_obj_type_t *type, size_t n_args,
9595
static const mp_arg_t allowed_args[] = {
9696
{ MP_QSTR_source, MP_ARG_REQUIRED | MP_ARG_OBJ },
9797
{ MP_QSTR_sub, MP_ARG_KW_ONLY | MP_ARG_BOOL, {.u_bool = FALSE} },
98-
{ MP_QSTR_x1, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_PTR(&mp_const_none_obj)} },
99-
{ MP_QSTR_y1, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_PTR(&mp_const_none_obj)} },
100-
{ MP_QSTR_x2, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_PTR(&mp_const_none_obj)} },
101-
{ MP_QSTR_y2, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_PTR(&mp_const_none_obj)} },
98+
{ MP_QSTR_x1, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
99+
{ MP_QSTR_y1, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
100+
{ MP_QSTR_x2, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
101+
{ MP_QSTR_y2, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
102102
};
103103

104104
mp_arg_val_t arg_vals[MP_ARRAY_SIZE(allowed_args)];

py/pbkwarg.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,6 @@
9393
#define PB_ARG_DEFAULT_TRUE(name)(name, MP_ARG_OBJ, {.u_rom_obj = MP_ROM_TRUE})
9494

9595
// Optional keyword argument with default true value
96-
#define PB_ARG_DEFAULT_NONE(name)(name, MP_ARG_OBJ, {.u_rom_obj = MP_ROM_PTR(&mp_const_none_obj)})
96+
#define PB_ARG_DEFAULT_NONE(name)(name, MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE})
9797

9898
#endif // PYBRICKS_INCLUDED_PBKWARG_H

0 commit comments

Comments
 (0)