diff options
| author | Mark <56205165+gamblor21@users.noreply.github.com> | 2020-12-01 15:47:16 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-01 15:47:16 -0600 |
| commit | 237385798cb6989a5ed13e120c3cc5e2415af935 (patch) | |
| tree | 932aa4302e84bd59f84c29c2364f9c6d75192fb2 /py/objmodule.c | |
| parent | 23ed3ef971f8f38497337874da39273e5ae090d7 (diff) | |
| parent | 5b3c930e384ef6440f0f7b5167bb54ea68a8be76 (diff) | |
Merge branch 'main' into bus_device
Diffstat (limited to 'py/objmodule.c')
| -rw-r--r-- | py/objmodule.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/py/objmodule.c b/py/objmodule.c index 757aece04..90796c535 100644 --- a/py/objmodule.c +++ b/py/objmodule.c @@ -239,7 +239,12 @@ STATIC const mp_rom_map_elem_t mp_builtin_module_table[] = { { MP_ROM_QSTR(MP_QSTR_hashlib), MP_ROM_PTR(&mp_module_uhashlib) }, #endif #if MICROPY_PY_UBINASCII - { MP_ROM_QSTR(MP_QSTR_binascii), MP_ROM_PTR(&mp_module_ubinascii) }, +#if CIRCUITPY +// CircuitPython: Defined in MICROPY_PORT_BUILTIN_MODULES, so not defined here. +// TODO: move to shared-bindings/ +#else + { MP_ROM_QSTR(MP_QSTR_ubinascii), MP_ROM_PTR(&mp_module_ubinascii) }, +#endif #endif #if MICROPY_PY_URANDOM { MP_ROM_QSTR(MP_QSTR_urandom), MP_ROM_PTR(&mp_module_urandom) }, |