diff options
| author | Jeff Epler <jeff@adafruit.com> | 2020-10-27 11:47:44 -0500 |
|---|---|---|
| committer | Seon Rozenblum <seon@unexpectedmaker.com> | 2021-01-04 09:52:42 +1100 |
| commit | 2a5f3de1cdec92d412148cabaf605a750d238234 (patch) | |
| tree | 9c187db62ecbec0000b4533c95f4089901f3b5ae /py/objmodule.c | |
| parent | caca0609bdbc8f5b1b406fad19878505bb5492a5 (diff) | |
| parent | d0e54993e9546249911c2c380c870e6a7f2b9917 (diff) | |
Merge pull request #3608 from adafruit/6.0.x
Update main with latest 6.0.x
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) }, |