summaryrefslogtreecommitdiffstatshomepage
path: root/py/builtintables.c
diff options
context:
space:
mode:
authorDamien George <damien.p.george@gmail.com>2014-04-08 21:13:04 +0100
committerDamien George <damien.p.george@gmail.com>2014-04-08 21:13:04 +0100
commit4671392d90e98ea4edf6e9ce7023d21cc9957d8c (patch)
tree4f70ac602368c818594b6623f5d2929bab5f1f08 /py/builtintables.c
parent1d24ea5207ba4b62b20dbba22ab2800496418463 (diff)
parent4dcb605ac403c99390ba3ce6fab01fa8c52b3dd0 (diff)
downloadmicropython-4671392d90e98ea4edf6e9ce7023d21cc9957d8c.tar.gz
micropython-4671392d90e98ea4edf6e9ce7023d21cc9957d8c.zip
Merge branch 'master' of github.com:micropython/micropython
Diffstat (limited to 'py/builtintables.c')
-rw-r--r--py/builtintables.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/py/builtintables.c b/py/builtintables.c
index 9a46be6e0a..ea864c6c70 100644
--- a/py/builtintables.c
+++ b/py/builtintables.c
@@ -17,6 +17,7 @@ STATIC const mp_map_elem_t mp_builtin_object_table[] = {
// built-in types
{ MP_OBJ_NEW_QSTR(MP_QSTR_bool), (mp_obj_t)&mp_type_bool },
{ MP_OBJ_NEW_QSTR(MP_QSTR_bytes), (mp_obj_t)&mp_type_bytes },
+ { MP_OBJ_NEW_QSTR(MP_QSTR_bytearray), (mp_obj_t)&mp_type_bytearray },
#if MICROPY_ENABLE_FLOAT
{ MP_OBJ_NEW_QSTR(MP_QSTR_complex), (mp_obj_t)&mp_type_complex },
#endif
@@ -72,7 +73,6 @@ STATIC const mp_map_elem_t mp_builtin_object_table[] = {
{ MP_OBJ_NEW_QSTR(MP_QSTR_repr), (mp_obj_t)&mp_builtin_repr_obj },
{ MP_OBJ_NEW_QSTR(MP_QSTR_sorted), (mp_obj_t)&mp_builtin_sorted_obj },
{ MP_OBJ_NEW_QSTR(MP_QSTR_sum), (mp_obj_t)&mp_builtin_sum_obj },
- { MP_OBJ_NEW_QSTR(MP_QSTR_bytearray), (mp_obj_t)&mp_builtin_bytearray_obj },
// built-in exceptions
{ MP_OBJ_NEW_QSTR(MP_QSTR_BaseException), (mp_obj_t)&mp_type_BaseException },