diff options
| author | jgillick <j_gillick@yahoo.com> | 2020-11-22 01:07:03 -0800 |
|---|---|---|
| committer | jgillick <j_gillick@yahoo.com> | 2020-11-22 01:07:03 -0800 |
| commit | 63b0bf9075178984276d33bbf0282b24dce33997 (patch) | |
| tree | f23afdc09c957751357170647661ee68fcf8d4b9 /py/objmodule.c | |
| parent | 5f0a372a2206c14e4ae206ec7cb879265aa7a38a (diff) | |
| parent | 2f146090444492c344a0260faa151660f5ec3c7a (diff) | |
Merge remote-tracking branch 'origin/main' into thunderpack1.2
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) }, |