diff options
| author | Paul Sokolovsky <pfalcon@users.sourceforge.net> | 2014-06-12 01:22:25 +0300 |
|---|---|---|
| committer | Paul Sokolovsky <pfalcon@users.sourceforge.net> | 2014-06-12 01:22:25 +0300 |
| commit | fbdf2f1d63e39cb197e6cebb340af4a648c96121 (patch) | |
| tree | 44f2ff0a4426f1fd5fe43d7dd344a7576298adae | |
| parent | 8a0801ad24eb7cab4b80ff23249412d7a8af9995 (diff) | |
| download | micropython-fbdf2f1d63e39cb197e6cebb340af4a648c96121.tar.gz micropython-fbdf2f1d63e39cb197e6cebb340af4a648c96121.zip | |
py: Rename builtin "io" to "_io".
Functionality we provide in builtin io module is fairly minimal. Some
code, including CPython stdlib, depends on more functionality. So, there's
a choice to either implement it in C, or move it _io, and let implement other
functionality in Python. 2nd choice is pursued. This setup matches CPython
too (_io is builtin, io is Python-level).
| -rw-r--r-- | py/builtintables.c | 2 | ||||
| -rw-r--r-- | py/modio.c | 4 | ||||
| -rw-r--r-- | py/qstrdefs.h | 2 | ||||
| -rw-r--r-- | tests/io/stringio1.py | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/py/builtintables.c b/py/builtintables.c index 1041c2598c..857a581de4 100644 --- a/py/builtintables.c +++ b/py/builtintables.c @@ -162,7 +162,7 @@ STATIC const mp_map_elem_t mp_builtin_module_table[] = { { MP_OBJ_NEW_QSTR(MP_QSTR_array), (mp_obj_t)&mp_module_array }, #if MICROPY_PY_IO - { MP_OBJ_NEW_QSTR(MP_QSTR_io), (mp_obj_t)&mp_module_io }, + { MP_OBJ_NEW_QSTR(MP_QSTR__io), (mp_obj_t)&mp_module_io }, #endif #if MICROPY_PY_COLLECTIONS { MP_OBJ_NEW_QSTR(MP_QSTR__collections), (mp_obj_t)&mp_module_collections }, diff --git a/py/modio.c b/py/modio.c index e1761f7ea6..08c6c59dd9 100644 --- a/py/modio.c +++ b/py/modio.c @@ -36,7 +36,7 @@ extern const mp_obj_type_t mp_type_fileio; extern const mp_obj_type_t mp_type_textio; STATIC const mp_map_elem_t mp_module_io_globals_table[] = { - { MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_io) }, + { MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR__io) }, // Note: mp_builtin_open_obj should be defined by port, it's not // part of the core. { MP_OBJ_NEW_QSTR(MP_QSTR_open), (mp_obj_t)&mp_builtin_open_obj }, @@ -65,7 +65,7 @@ STATIC const mp_obj_dict_t mp_module_io_globals = { const mp_obj_module_t mp_module_io = { .base = { &mp_type_module }, - .name = MP_QSTR_io, + .name = MP_QSTR__io, .globals = (mp_obj_dict_t*)&mp_module_io_globals, }; diff --git a/py/qstrdefs.h b/py/qstrdefs.h index 521d4399a5..856853fa55 100644 --- a/py/qstrdefs.h +++ b/py/qstrdefs.h @@ -361,7 +361,7 @@ Q(unpack) #endif #if MICROPY_PY_IO -Q(io) +Q(_io) Q(readall) Q(readline) Q(readlines) diff --git a/tests/io/stringio1.py b/tests/io/stringio1.py index f69f62f75f..6979fe7c9d 100644 --- a/tests/io/stringio1.py +++ b/tests/io/stringio1.py @@ -1,4 +1,4 @@ -import io +import _io as io a = io.StringIO() print(a.getvalue()) |