diff options
| author | DavePutz <dwputz@gmail.com> | 2020-11-16 10:30:10 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-16 10:30:10 -0600 |
| commit | 3abc671bbdf617dcf87cbd4eda1201c944c05651 (patch) | |
| tree | 47f6a854677781382d715791e7d7534d71887f7a /py/objmodule.c | |
| parent | 2b4d12abcc09b22985d456f3a05fc8511fc9def4 (diff) | |
| parent | f2e911ad91db7c04673e76c884abbc19494a4e7f (diff) | |
Merge pull request #34 from adafruit/main
Update from adafruit/main
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) }, |