py: Add checks for stream objects in print() and sys.print_exception().

dpgeorge · dpgeorge · commit 582b19076464 · 2018-06-20T15:57:10.000+10:00
diff --git a/py/modbuiltins.c b/py/modbuiltins.c
@@ -386,7 +386,7 @@ STATIC mp_obj_t mp_builtin_print(size_t n_args, const mp_obj_t *pos_args, mp_map
     mp_arg_parse_all(0, NULL, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, u.args);
 
     #if MICROPY_PY_IO && MICROPY_PY_SYS_STDFILES
-    // TODO file may not be a concrete object (eg it could be a small-int)
+    mp_get_stream_raise(u.args[ARG_file].u_obj, MP_STREAM_OP_WRITE);
     mp_print_t print = {MP_OBJ_TO_PTR(u.args[ARG_file].u_obj), mp_stream_write_adaptor};
     #endif
 
diff --git a/py/modsys.c b/py/modsys.c
@@ -106,7 +106,8 @@ STATIC mp_obj_t mp_sys_print_exception(size_t n_args, const mp_obj_t *args) {
     #if MICROPY_PY_IO && MICROPY_PY_SYS_STDFILES
     void *stream_obj = &mp_sys_stdout_obj;
     if (n_args > 1) {
-        stream_obj = MP_OBJ_TO_PTR(args[1]); // XXX may fail
+        mp_get_stream_raise(args[1], MP_STREAM_OP_WRITE);
+        stream_obj = MP_OBJ_TO_PTR(args[1]);
     }
 
     mp_print_t print = {stream_obj, mp_stream_write_adaptor};

Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,8 @@ STATIC mp_obj_t mp_sys_print_exception(size_t n_args, const mp_obj_t *args) {`
`106`	`106`	`#if MICROPY_PY_IO && MICROPY_PY_SYS_STDFILES`
`107`	`107`	`void *stream_obj = &mp_sys_stdout_obj;`
`108`	`108`	`if (n_args > 1) {`
`109`		`- stream_obj = MP_OBJ_TO_PTR(args[1]); // XXX may fail`
	`109`	`+ mp_get_stream_raise(args[1], MP_STREAM_OP_WRITE);`
	`110`	`+ stream_obj = MP_OBJ_TO_PTR(args[1]);`
`110`	`111`	`}`
`111`	`112`
`112`	`113`	`mp_print_t print = {stream_obj, mp_stream_write_adaptor};`