Skip to content

Add "u" prefix in repr() of usys objects. #7709

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Add "u" prefix in repr() of usys objects. #7709

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a564581
extmod: Print uio instead of io for usys objects.
laurensvalk Aug 26, 2021
c925608
py/mpconfig: Prefix module names with u.
laurensvalk Aug 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion extmod/vfs_fat_file.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ typedef struct _pyb_file_obj_t {

STATIC void file_obj_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
(void)kind;
mp_printf(print, "<io.%s %p>", mp_obj_get_type_str(self_in), MP_OBJ_TO_PTR(self_in));
mp_printf(print, "<uio.%s %p>", mp_obj_get_type_str(self_in), MP_OBJ_TO_PTR(self_in));
}

STATIC mp_uint_t file_obj_read(mp_obj_t self_in, void *buf, mp_uint_t size, int *errcode) {
Expand Down
2 changes: 1 addition & 1 deletion extmod/vfs_lfsx_file.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ STATIC void MP_VFS_LFSx(check_open)(MP_OBJ_VFS_LFSx_FILE * self) {
STATIC void MP_VFS_LFSx(file_print)(const mp_print_t * print, mp_obj_t self_in, mp_print_kind_t kind) {
(void)self_in;
(void)kind;
mp_printf(print, "<io.%s>", mp_obj_get_type_str(self_in));
mp_printf(print, "<uio.%s>", mp_obj_get_type_str(self_in));
}

mp_obj_t MP_VFS_LFSx(file_open)(mp_obj_t self_in, mp_obj_t path_in, mp_obj_t mode_in) {
Expand Down
4 changes: 2 additions & 2 deletions extmod/vfs_posix_file.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ STATIC void check_fd_is_open(const mp_obj_vfs_posix_file_t *o) {
STATIC void vfs_posix_file_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
(void)kind;
mp_obj_vfs_posix_file_t *self = MP_OBJ_TO_PTR(self_in);
mp_printf(print, "<io.%s %d>", mp_obj_get_type_str(self_in), self->fd);
mp_printf(print, "<uio.%s %d>", mp_obj_get_type_str(self_in), self->fd);
}

mp_obj_t mp_vfs_posix_file_open(const mp_obj_type_t *type, mp_obj_t file_in, mp_obj_t mode_in) {
Expand All @@ -82,7 +82,7 @@ mp_obj_t mp_vfs_posix_file_open(const mp_obj_type_t *type, mp_obj_t file_in, mp_
mode_rw = O_RDWR;
break;
#if MICROPY_PY_IO_FILEIO
// If we don't have io.FileIO, then files are in text mode implicitly
// If we don't have uio.FileIO, then files are in text mode implicitly
case 'b':
type = &mp_type_vfs_posix_fileio;
break;
Expand Down
36 changes: 18 additions & 18 deletions py/mpconfig.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1139,7 +1139,7 @@ typedef double mp_float_t;
#define MICROPY_PY_ATTRTUPLE (1)
#endif

// Whether to provide "collections" module
// Whether to provide "ucollections" module
#ifndef MICROPY_PY_COLLECTIONS
#define MICROPY_PY_COLLECTIONS (1)
#endif
Expand All @@ -1149,7 +1149,7 @@ typedef double mp_float_t;
#define MICROPY_PY_COLLECTIONS_DEQUE (0)
#endif

// Whether to provide "collections.OrderedDict" type
// Whether to provide "ucollections.OrderedDict" type
#ifndef MICROPY_PY_COLLECTIONS_ORDEREDDICT
#define MICROPY_PY_COLLECTIONS_ORDEREDDICT (0)
#endif
Expand Down Expand Up @@ -1214,12 +1214,12 @@ typedef double mp_float_t;
#define MICROPY_PY_GC_COLLECT_RETVAL (0)
#endif

// Whether to provide "io" module
// Whether to provide "uio" module
#ifndef MICROPY_PY_IO
#define MICROPY_PY_IO (1)
#endif

// Whether to provide "io.IOBase" class to support user streams
// Whether to provide "uio.IOBase" class to support user streams
#ifndef MICROPY_PY_IO_IOBASE
#define MICROPY_PY_IO_IOBASE (0)
#endif
Expand All @@ -1235,73 +1235,73 @@ typedef double mp_float_t;
#define MICROPY_PY_IO_RESOURCE_STREAM (0)
#endif

// Whether to provide "io.FileIO" class
// Whether to provide "uio.FileIO" class
#ifndef MICROPY_PY_IO_FILEIO
#define MICROPY_PY_IO_FILEIO (0)
#endif

// Whether to provide "io.BytesIO" class
// Whether to provide "uio.BytesIO" class
#ifndef MICROPY_PY_IO_BYTESIO
#define MICROPY_PY_IO_BYTESIO (1)
#endif

// Whether to provide "io.BufferedWriter" class
// Whether to provide "uio.BufferedWriter" class
#ifndef MICROPY_PY_IO_BUFFEREDWRITER
#define MICROPY_PY_IO_BUFFEREDWRITER (0)
#endif

// Whether to provide "struct" module
// Whether to provide "ustruct" module
#ifndef MICROPY_PY_STRUCT
#define MICROPY_PY_STRUCT (1)
#endif

// Whether to provide "sys" module
// Whether to provide "usys" module
#ifndef MICROPY_PY_SYS
#define MICROPY_PY_SYS (1)
#endif

// Whether to provide "sys.maxsize" constant
// Whether to provide "usys.maxsize" constant
#ifndef MICROPY_PY_SYS_MAXSIZE
#define MICROPY_PY_SYS_MAXSIZE (0)
#endif

// Whether to provide "sys.modules" dictionary
// Whether to provide "usys.modules" dictionary
#ifndef MICROPY_PY_SYS_MODULES
#define MICROPY_PY_SYS_MODULES (1)
#endif

// Whether to provide "sys.exc_info" function
// Whether to provide "usys.exc_info" function
// Avoid enabling this, this function is Python2 heritage
#ifndef MICROPY_PY_SYS_EXC_INFO
#define MICROPY_PY_SYS_EXC_INFO (0)
#endif

// Whether to provide "sys.exit" function
// Whether to provide "usys.exit" function
#ifndef MICROPY_PY_SYS_EXIT
#define MICROPY_PY_SYS_EXIT (1)
#endif

// Whether to provide "sys.atexit" function (MicroPython extension)
// Whether to provide "usys.atexit" function (MicroPython extension)
#ifndef MICROPY_PY_SYS_ATEXIT
#define MICROPY_PY_SYS_ATEXIT (0)
#endif

// Whether to provide "sys.settrace" function
// Whether to provide "usys.settrace" function
#ifndef MICROPY_PY_SYS_SETTRACE
#define MICROPY_PY_SYS_SETTRACE (0)
#endif

// Whether to provide "sys.getsizeof" function
// Whether to provide "usys.getsizeof" function
#ifndef MICROPY_PY_SYS_GETSIZEOF
#define MICROPY_PY_SYS_GETSIZEOF (0)
#endif

// Whether to provide sys.{stdin,stdout,stderr} objects
// Whether to provide usys.{stdin,stdout,stderr} objects
#ifndef MICROPY_PY_SYS_STDFILES
#define MICROPY_PY_SYS_STDFILES (0)
#endif

// Whether to provide sys.{stdin,stdout,stderr}.buffer object
// Whether to provide usys.{stdin,stdout,stderr}.buffer object
// This is implemented per-port
#ifndef MICROPY_PY_SYS_STDIO_BUFFER
#define MICROPY_PY_SYS_STDIO_BUFFER (0)
Expand Down
2 changes: 1 addition & 1 deletion py/objstringio.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ STATIC void check_stringio_is_open(const mp_obj_stringio_t *o) {
STATIC void stringio_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
(void)kind;
mp_obj_stringio_t *self = MP_OBJ_TO_PTR(self_in);
mp_printf(print, self->base.type == &mp_type_stringio ? "<io.StringIO 0x%x>" : "<io.BytesIO 0x%x>", self);
mp_printf(print, self->base.type == &mp_type_stringio ? "<uio.StringIO 0x%x>" : "<uio.BytesIO 0x%x>", self);
}

STATIC mp_uint_t stringio_read(mp_obj_t o_in, void *buf, mp_uint_t size, int *errcode) {
Expand Down
2 changes: 1 addition & 1 deletion shared/runtime/sys_stdio_mphal.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ STATIC const sys_stdio_obj_t stdio_buffer_obj;

void stdio_obj_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
sys_stdio_obj_t *self = MP_OBJ_TO_PTR(self_in);
mp_printf(print, "<io.FileIO %d>", self->fd);
mp_printf(print, "<uio.FileIO %d>", self->fd);
}

STATIC mp_uint_t stdio_read(mp_obj_t self_in, void *buf, mp_uint_t size, int *errcode) {
Expand Down
2 changes: 1 addition & 1 deletion tests/extmod/vfs_fat_fileio1.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ def ioctl(self, op, arg):

# file IO
f = open("foo_file.txt", "w")
print(str(f)[:17], str(f)[-1:])
print(str(f)[:18], str(f)[-1:])
f.write("hello!")
f.flush()
f.close()
Expand Down
2 changes: 1 addition & 1 deletion tests/extmod/vfs_fat_fileio1.py.exp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<io.TextIOWrapper >
<uio.TextIOWrapper >
True
True
True
Expand Down
8 changes: 4 additions & 4 deletions tests/extmod/vfs_lfs_file.py.exp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
test <class 'VfsLfs1'>
<io.TextIOWrapper>
<io.FileIO>
<uio.TextIOWrapper>
<uio.FileIO>
open OSError
littlefs
littlefs
Expand All @@ -13,8 +13,8 @@ open OSError
littlefs
b'littlefsMORE'
test <class 'VfsLfs2'>
<io.TextIOWrapper>
<io.FileIO>
<uio.TextIOWrapper>
<uio.FileIO>
open OSError
littlefs
littlefs
Expand Down
2 changes: 1 addition & 1 deletion tests/extmod/vfs_posix.py.exp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
True
<class 'tuple'>
<class 'list'>
<io.TextIOWrapper 2>
<uio.TextIOWrapper 2>
hello
['test2']
['test2']
Expand Down