commit 46c3ab20049af16e97863e90e5761fae329f872a
author Paul Sokolovsky <pfalcon@users.sourceforge.net> Sat Dec 06 14:29:09 2014 +0200
committer Damien George <damien.p.george@gmail.com> Mon Dec 08 20:25:49 2014 +0000
tree cbe6230dcad6972d7d50c6d08c4e4c4da215abb1
parent d0caaadaeea48e8f76dca3125a2dea3465a58416

modsys: Add sys.print_exception(exc, file=sys.stdout) function.

The function is modeled after traceback.print_exception(), but unbloated,
and put into existing module to save overhead on adding another module.
Compliant traceback.print_exception() is intended to be implemented in
micropython-lib in terms of sys.print_exception().

This change required refactoring mp_obj_print_exception() to take pfenv_t
interface arguments.

Addresses #751.

py/modsys.c

diff --git a/py/modsys.c b/py/modsys.c
index d9be7d1..06bd4c8 100644
--- a/py/modsys.c
+++ b/py/modsys.c
@@ -38,6 +38,8 @@
 #include "objstr.h"
 #include "mpz.h"
 #include "objint.h"
+#include "pfenv.h"
+#include "stream.h"
 
 #if MICROPY_PY_SYS
 
@@ -78,6 +80,25 @@
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_sys_exit_obj, 0, 1, mp_sys_exit);
 
+STATIC mp_obj_t mp_sys_print_exception(mp_uint_t n_args, const mp_obj_t *args) {
+    #if MICROPY_PY_IO
+    mp_obj_t stream_obj = &mp_sys_stdout_obj;
+    if (n_args > 1) {
+        stream_obj = args[1];
+    }
+
+    pfenv_t pfenv;
+    pfenv.data = stream_obj;
+    pfenv.print_strn = (void (*)(void *, const char *, mp_uint_t))mp_stream_write;
+    mp_obj_print_exception((void (*)(void *env, const char *fmt, ...))pfenv_printf, &pfenv, args[0]);
+    #else
+    mp_obj_print_exception(printf_wrapper, NULL, args[0]);
+    #endif
+
+    return mp_const_none;
+}
+MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_sys_print_exception_obj, 1, 2, mp_sys_print_exception);
+
 STATIC const mp_map_elem_t mp_module_sys_globals_table[] = {
     { MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_sys) },
 
@@ -118,6 +139,12 @@
     { MP_OBJ_NEW_QSTR(MP_QSTR_stdout), (mp_obj_t)&mp_sys_stdout_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_stderr), (mp_obj_t)&mp_sys_stderr_obj },
 #endif
+
+    /*
+     * Extensions to CPython
+     */
+
+    { MP_OBJ_NEW_QSTR(MP_QSTR_print_exception), (mp_obj_t)&mp_sys_print_exception_obj },
 };
 
 STATIC MP_DEFINE_CONST_DICT(mp_module_sys_globals, mp_module_sys_globals_table);