djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

move non-u names for native modules to circuitpy_mpconfig.h

Browse Source
This commit is contained in:
Dan Halbert 2019-02-18 12:08:23 -05:00
parent 339a22752b
commit ba77a9ca80
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
py/circuitpy_mpconfig.h
View File

@ -460,12 +460,26 @@ extern const struct _mp_obj_module_t ustack_module;
#define USTACK_MODULE #define USTACK_MODULE
#endif #endif
// These modules are not yet in shared-bindings, but we prefer the non-uxxx names.
#if MICROPY_PY_UERRNO
#define ERRNO_MODULE
{ MP_ROM_QSTR(MP_QSTR_errno), MP_ROM_PTR(&mp_module_uerrno) },
#else
#define ERRNO_MODULE
#endif
#if MICROPY_PY_UJSON #if MICROPY_PY_UJSON
#define JSON_MODULE { MP_ROM_QSTR(MP_QSTR_json), MP_ROM_PTR(&mp_module_ujson) }, #define JSON_MODULE { MP_ROM_QSTR(MP_QSTR_json), MP_ROM_PTR(&mp_module_ujson) },
#else #else
#define JSON_MODULE #define JSON_MODULE
#endif #endif
#if MICROPY_PY_URE
#define RE_MODULE { MP_ROM_QSTR(MP_QSTR_re), MP_ROM_PTR(&mp_module_ure) },
#else
#define RE_MODULE
#endif
// Define certain native modules with weak links so they can be replaced with Python // Define certain native modules with weak links so they can be replaced with Python
// implementations. This list may grow over time. // implementations. This list may grow over time.
#define MICROPY_PORT_BUILTIN_MODULE_WEAK_LINKS \ #define MICROPY_PORT_BUILTIN_MODULE_WEAK_LINKS \
@ -495,6 +509,7 @@ extern const struct _mp_obj_module_t ustack_module;
DIGITALIO_MODULE \ DIGITALIO_MODULE \
TERMINALIO_MODULE \ TERMINALIO_MODULE \
DISPLAYIO_MODULE \ DISPLAYIO_MODULE \
ERRNO_MODULE \
GAMEPAD_MODULE \ GAMEPAD_MODULE \
I2CSLAVE_MODULE \ I2CSLAVE_MODULE \
JSON_MODULE \ JSON_MODULE \
@ -507,6 +522,7 @@ extern const struct _mp_obj_module_t ustack_module;
PIXELBUF_MODULE \ PIXELBUF_MODULE \
PULSEIO_MODULE \ PULSEIO_MODULE \
RANDOM_MODULE \ RANDOM_MODULE \
RE_MODULE \
RTC_MODULE \ RTC_MODULE \
SAMD_MODULE \ SAMD_MODULE \
STAGE_MODULE \ STAGE_MODULE \

3
py/objmodule.c
View File

@ -179,7 +179,6 @@ STATIC const mp_rom_map_elem_t mp_builtin_module_table[] = {
// extmod modules // extmod modules
#if MICROPY_PY_UERRNO #if MICROPY_PY_UERRNO
{ MP_ROM_QSTR(MP_QSTR_errno), MP_ROM_PTR(&mp_module_uerrno) },
{ MP_ROM_QSTR(MP_QSTR_uerrno), MP_ROM_PTR(&mp_module_uerrno) }, { MP_ROM_QSTR(MP_QSTR_uerrno), MP_ROM_PTR(&mp_module_uerrno) },
#endif #endif
#if MICROPY_PY_UCTYPES #if MICROPY_PY_UCTYPES
@ -189,11 +188,9 @@ STATIC const mp_rom_map_elem_t mp_builtin_module_table[] = {
{ MP_ROM_QSTR(MP_QSTR_uzlib), MP_ROM_PTR(&mp_module_uzlib) }, { MP_ROM_QSTR(MP_QSTR_uzlib), MP_ROM_PTR(&mp_module_uzlib) },
#endif #endif
#if MICROPY_PY_UJSON #if MICROPY_PY_UJSON
{ MP_ROM_QSTR(MP_QSTR_json), MP_ROM_PTR(&mp_module_ujson) },
{ MP_ROM_QSTR(MP_QSTR_ujson), MP_ROM_PTR(&mp_module_ujson) }, { MP_ROM_QSTR(MP_QSTR_ujson), MP_ROM_PTR(&mp_module_ujson) },
#endif #endif
#if MICROPY_PY_URE #if MICROPY_PY_URE
{ MP_ROM_QSTR(MP_QSTR_re), MP_ROM_PTR(&mp_module_ure) },
{ MP_ROM_QSTR(MP_QSTR_ure), MP_ROM_PTR(&mp_module_ure) }, { MP_ROM_QSTR(MP_QSTR_ure), MP_ROM_PTR(&mp_module_ure) },
#endif #endif
#if MICROPY_PY_UHEAPQ #if MICROPY_PY_UHEAPQ