summaryrefslogtreecommitdiff
path: root/py/objmodule.c
diff options
context:
space:
mode:
authorDan Halbert <halbert@adafruit.com>2020-11-05 16:16:41 -0500
committerGitHub <noreply@github.com>2020-11-05 16:16:41 -0500
commit36a8828fa36a18d7bb0eeb950d6d1676c1f429a4 (patch)
tree964568845aae9233b037628f9f2b18d3411d8c3b /py/objmodule.c
parent81bb92bdd2a9b9ee50e251743ad35a2d23be3d99 (diff)
parent72b829dff02cb9b8ebe6e2b47354f06650dbe864 (diff)
Merge pull request #3632 from dhalbert/add-binascii
add binascii to most builds
Diffstat (limited to 'py/objmodule.c')
-rw-r--r--py/objmodule.c7
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) },