Skip to content

Commit c5dbdbe

Browse files
dhalbertdhalbert
committed
rename ure, ujson, and uerrno to re, json, and errno
1 parent 4e75aae commit c5dbdbe

4 files changed

Lines changed: 14 additions & 8 deletions

File tree

‎extmod/modujson.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ STATIC mp_obj_t mod_ujson_loads(mp_obj_t obj) {
292292
STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_ujson_loads_obj, mod_ujson_loads);
293293

294294
STATIC const mp_rom_map_elem_t mp_module_ujson_globals_table[] = {
295-
{ MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_ujson) },
295+
{ MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_json) },
296296
{ MP_ROM_QSTR(MP_QSTR_dump), MP_ROM_PTR(&mod_ujson_dump_obj) },
297297
{ MP_ROM_QSTR(MP_QSTR_dumps), MP_ROM_PTR(&mod_ujson_dumps_obj) },
298298
{ MP_ROM_QSTR(MP_QSTR_load), MP_ROM_PTR(&mod_ujson_load_obj) },

‎extmod/modure.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -405,7 +405,7 @@ STATIC MP_DEFINE_CONST_DICT(re_locals_dict, re_locals_dict_table);
405405

406406
STATIC const mp_obj_type_t re_type = {
407407
{ &mp_type_type },
408-
.name = MP_QSTR_ure,
408+
.name = MP_QSTR_re,
409409
.print = re_print,
410410
.locals_dict = (void*)&re_locals_dict,
411411
};
@@ -462,7 +462,7 @@ MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_re_sub_obj, 3, 5, mod_re_sub);
462462
#endif
463463

464464
STATIC const mp_rom_map_elem_t mp_module_re_globals_table[] = {
465-
{ MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_ure) },
465+
{ MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_re) },
466466
{ MP_ROM_QSTR(MP_QSTR_compile), MP_ROM_PTR(&mod_re_compile_obj) },
467467
{ MP_ROM_QSTR(MP_QSTR_match), MP_ROM_PTR(&mod_re_match_obj) },
468468
{ MP_ROM_QSTR(MP_QSTR_search), MP_ROM_PTR(&mod_re_search_obj) },

‎py/moduerrno.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ STATIC const mp_obj_dict_t errorcode_dict = {
8484
#endif
8585

8686
STATIC const mp_rom_map_elem_t mp_module_uerrno_globals_table[] = {
87-
{ MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_uerrno) },
87+
{ MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_errno) },
8888
#if MICROPY_PY_UERRNO_ERRORCODE
8989
{ MP_ROM_QSTR(MP_QSTR_errorcode), MP_ROM_PTR(&errorcode_dict) },
9090
#endif

‎py/objmodule.c‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -149,11 +149,11 @@ STATIC const mp_rom_map_elem_t mp_builtin_module_table[] = {
149149
#endif
150150
#if MICROPY_PY_IO
151151
{ MP_ROM_QSTR(MP_QSTR_io), MP_ROM_PTR(&mp_module_io) },
152-
{ MP_ROM_QSTR(MP_QSTR_uio), MP_ROM_PTR(&mp_module_io) },
153152
#endif
154153
#if MICROPY_PY_COLLECTIONS
155154
{ MP_ROM_QSTR(MP_QSTR_collections), MP_ROM_PTR(&mp_module_collections) },
156155
#endif
156+
// CircuitPython: Now in shared-bindings/, so not defined here.
157157
#if MICROPY_PY_STRUCT
158158
{ MP_ROM_QSTR(MP_QSTR_ustruct), MP_ROM_PTR(&mp_module_ustruct) },
159159
#endif
@@ -179,7 +179,9 @@ STATIC const mp_rom_map_elem_t mp_builtin_module_table[] = {
179179
// extmod modules
180180

181181
#if MICROPY_PY_UERRNO
182-
{ MP_ROM_QSTR(MP_QSTR_uerrno), MP_ROM_PTR(&mp_module_uerrno) },
182+
// CircuitPython: Defined in MICROPY_PORT_BUILTIN_MODULES, so not defined here.
183+
// TODO: move to shared-bindings/
184+
// { MP_ROM_QSTR(MP_QSTR_uerrno), MP_ROM_PTR(&mp_module_uerrno) },
183185
#endif
184186
#if MICROPY_PY_UCTYPES
185187
{ MP_ROM_QSTR(MP_QSTR_uctypes), MP_ROM_PTR(&mp_module_uctypes) },
@@ -188,10 +190,14 @@ STATIC const mp_rom_map_elem_t mp_builtin_module_table[] = {
188190
{ MP_ROM_QSTR(MP_QSTR_uzlib), MP_ROM_PTR(&mp_module_uzlib) },
189191
#endif
190192
#if MICROPY_PY_UJSON
191-
{ MP_ROM_QSTR(MP_QSTR_ujson), MP_ROM_PTR(&mp_module_ujson) },
193+
// CircuitPython: Defined in MICROPY_PORT_BUILTIN_MODULES, so not defined here.
194+
// TODO: move to shared-bindings/
195+
// { MP_ROM_QSTR(MP_QSTR_ujson), MP_ROM_PTR(&mp_module_ujson) },
192196
#endif
193197
#if MICROPY_PY_URE
194-
{ MP_ROM_QSTR(MP_QSTR_ure), MP_ROM_PTR(&mp_module_ure) },
198+
// CircuitPython: Defined in MICROPY_PORT_BUILTIN_MODULES, so not defined here.
199+
// TODO: move to shared-bindings/
200+
// { MP_ROM_QSTR(MP_QSTR_ure), MP_ROM_PTR(&mp_module_ure) },
195201
#endif
196202
#if MICROPY_PY_UHEAPQ
197203
{ MP_ROM_QSTR(MP_QSTR_uheapq), MP_ROM_PTR(&mp_module_uheapq) },

0 commit comments

Comments
 (0)