diff options
| -rw-r--r-- | py/builtintables.c | 2 | ||||
| -rw-r--r-- | py/modcollections.c | 4 | ||||
| -rw-r--r-- | py/qstrdefs.h | 2 | ||||
| -rw-r--r-- | tests/basics/namedtuple1.py | 5 |
4 files changed, 8 insertions, 5 deletions
diff --git a/py/builtintables.c b/py/builtintables.c index e2007f3b41..4b865e142c 100644 --- a/py/builtintables.c +++ b/py/builtintables.c @@ -126,7 +126,7 @@ STATIC const mp_map_elem_t mp_builtin_module_table[] = { #if MICROPY_ENABLE_MOD_IO { MP_OBJ_NEW_QSTR(MP_QSTR_io), (mp_obj_t)&mp_module_io }, #endif - { MP_OBJ_NEW_QSTR(MP_QSTR_collections), (mp_obj_t)&mp_module_collections }, + { MP_OBJ_NEW_QSTR(MP_QSTR__collections), (mp_obj_t)&mp_module_collections }, #if MICROPY_ENABLE_MOD_STRUCT { MP_OBJ_NEW_QSTR(MP_QSTR_struct), (mp_obj_t)&mp_module_struct }, #endif diff --git a/py/modcollections.c b/py/modcollections.c index dbd1896f20..11845a00ce 100644 --- a/py/modcollections.c +++ b/py/modcollections.c @@ -5,7 +5,7 @@ #include "builtin.h" STATIC const mp_map_elem_t mp_module_collections_globals_table[] = { - { MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_collections) }, + { MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR__collections) }, { MP_OBJ_NEW_QSTR(MP_QSTR_namedtuple), (mp_obj_t)&mp_namedtuple_obj }, }; @@ -22,6 +22,6 @@ STATIC const mp_obj_dict_t mp_module_collections_globals = { const mp_obj_module_t mp_module_collections = { .base = { &mp_type_module }, - .name = MP_QSTR_collections, + .name = MP_QSTR__collections, .globals = (mp_obj_dict_t*)&mp_module_collections_globals, }; diff --git a/py/qstrdefs.h b/py/qstrdefs.h index 7bd8dc653a..dbfb469e96 100644 --- a/py/qstrdefs.h +++ b/py/qstrdefs.h @@ -90,7 +90,7 @@ Q(calcsize) #endif Q(chr) Q(classmethod) -Q(collections) +Q(_collections) Q(complex) Q(dict) Q(dir) diff --git a/tests/basics/namedtuple1.py b/tests/basics/namedtuple1.py index 1e194472fb..98628cc545 100644 --- a/tests/basics/namedtuple1.py +++ b/tests/basics/namedtuple1.py @@ -1,4 +1,7 @@ -from collections import namedtuple +try: + from collections import namedtuple +except ImportError: + from _collections import namedtuple T = namedtuple("Tup", "foo bar") # CPython prints fully qualified name, what we don't bother to do so far |