diff options
| author | Paul Sokolovsky <pfalcon@users.sourceforge.net> | 2014-04-08 04:08:16 +0300 |
|---|---|---|
| committer | Paul Sokolovsky <pfalcon@users.sourceforge.net> | 2014-04-08 04:08:16 +0300 |
| commit | 72d70cb0455c61ee963d9063bd42a8b0f6c80789 (patch) | |
| tree | 97c6bec8777b290133f14d47ad416cba1628e7dd | |
| parent | b8cf9485508f4d2d52edf2734231f7dee1c1fd92 (diff) | |
| download | micropython-72d70cb0455c61ee963d9063bd42a8b0f6c80789.tar.gz micropython-72d70cb0455c61ee963d9063bd42a8b0f6c80789.zip | |
unix, stmhal: Consistently use "FileIO" as class name for file objects.
They correspond to io.FileIO in io module hierarchy (with small caveat
that io.FileIO is raw file and works with bytes, not strings).
| -rw-r--r-- | stmhal/file.c | 4 | ||||
| -rw-r--r-- | stmhal/qstrdefsport.h | 2 | ||||
| -rw-r--r-- | unix/file.c | 2 | ||||
| -rw-r--r-- | unix/qstrdefsport.h | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/stmhal/file.c b/stmhal/file.c index 6d743a0c8c..57d3d33847 100644 --- a/stmhal/file.c +++ b/stmhal/file.c @@ -15,7 +15,7 @@ typedef struct _pyb_file_obj_t { } pyb_file_obj_t; void file_obj_print(void (*print)(void *env, const char *fmt, ...), void *env, mp_obj_t self_in, mp_print_kind_t kind) { - printf("<file %p>", self_in); + printf("<io.FileIO %p>", self_in); } STATIC machine_int_t file_read(mp_obj_t self_in, void *buf, machine_uint_t size, int *errcode) { @@ -69,7 +69,7 @@ STATIC const mp_stream_p_t file_obj_stream_p = { STATIC const mp_obj_type_t file_obj_type = { { &mp_type_type }, - .name = MP_QSTR_File, + .name = MP_QSTR_FileIO, .make_new = file_obj_make_new, .print = file_obj_print, .getiter = mp_identity, diff --git a/stmhal/qstrdefsport.h b/stmhal/qstrdefsport.h index c846adc198..2c41f1b787 100644 --- a/stmhal/qstrdefsport.h +++ b/stmhal/qstrdefsport.h @@ -33,7 +33,7 @@ Q(SDcard) Q(gpio) Q(gpio_in) Q(gpio_out) -Q(File) +Q(FileIO) // Entries for sys.path Q(0:/) Q(0:/src) diff --git a/unix/file.c b/unix/file.c index 2cc17dfd34..fa7be791a4 100644 --- a/unix/file.c +++ b/unix/file.c @@ -130,7 +130,7 @@ STATIC const mp_stream_p_t rawfile_stream_p = { STATIC const mp_obj_type_t rawfile_type = { { &mp_type_type }, - .name = MP_QSTR_io_dot_FileIO, + .name = MP_QSTR_FileIO, .print = fdfile_print, .make_new = fdfile_make_new, .getiter = mp_identity, diff --git a/unix/qstrdefsport.h b/unix/qstrdefsport.h index fd259f327c..a4772a2be9 100644 --- a/unix/qstrdefsport.h +++ b/unix/qstrdefsport.h @@ -27,7 +27,7 @@ Q(accept) Q(recv) Q(setsockopt) -Q(io.FileIO) +Q(FileIO) Q(ffimod) Q(ffifunc) Q(fficallback) |