diff options
| author | Benjamin Shockley <benjaminshockley@hotmail.com> | 2021-01-03 10:41:16 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-03 10:41:16 -0600 |
| commit | 8c8961ad0142a20793910363c8182c847b47bc58 (patch) | |
| tree | 986358982921ccb6e887b0f0f5af39ec67709990 /py/objmodule.c | |
| parent | 0084f0af24e4e219bc040c52ee723959423de6e2 (diff) | |
| parent | 80fa60d4ef6a054cc481318caba96ef8d77fc026 (diff) | |
Merge pull request #3 from adafruit/main
Rebase
Diffstat (limited to 'py/objmodule.c')
| -rw-r--r-- | py/objmodule.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/py/objmodule.c b/py/objmodule.c index b6a8a084e..90796c535 100644 --- a/py/objmodule.c +++ b/py/objmodule.c @@ -3,7 +3,7 @@ * * The MIT License (MIT) * - * Copyright (c) 2013, 2014 Damien P. George + * SPDX-FileCopyrightText: Copyright (c) 2013, 2014 Damien P. George * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -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) }, |