diff options
| author | microDev <70126934+microDev1@users.noreply.github.com> | 2020-11-08 00:00:01 +0530 |
|---|---|---|
| committer | microDev <70126934+microDev1@users.noreply.github.com> | 2020-11-08 00:00:01 +0530 |
| commit | 479567059e2bb60e2fd5a2d58be26df2a9e6deae (patch) | |
| tree | cf218ca135a99ea99a4bc27fabe81d494153f1d9 /py/objmodule.c | |
| parent | 80029f6929ebbf6c0a02c5320e59220b0501bd55 (diff) | |
| parent | 18079c5bbe403a25556e19469a349742dca49633 (diff) | |
Merge branch 'main' into rotaryio-S2
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) }, |