Remove old traceback type

Both #1167 and #5072 add traceback types. #1167 added a bunch of
named tuples in order to reproduce the traceback string. Since #5072
added traceback printing, we don't need the old way. So, rollback
PR #1167 in favor of the newer traceback type.

Author: tannewt

py/modsys.c

@@ -26,6 +26,7 @@
  */
 
 #include "py/builtin.h"
+#include "py/objexcept.h"
 #include "py/objlist.h"
 #include "py/objmodule.h"
 #include "py/objtuple.h"
@@ -187,7 +188,8 @@ static mp_obj_t mp_sys_exc_info(void) {
     t->items[0] = MP_OBJ_FROM_PTR(mp_obj_get_type(cur_exc));
     t->items[1] = cur_exc;
     // CIRCUITPY-CHANGE: has traceback obj
-    t->items[2] = mp_obj_exception_get_traceback_obj(cur_exc);
+    mp_obj_exception_t *native_exc = mp_obj_exception_get_native(cur_exc);
+    t->items[2] = native_exc->traceback;
     return MP_OBJ_FROM_PTR(t);
 }
 MP_DEFINE_CONST_FUN_OBJ_0(mp_sys_exc_info_obj, mp_sys_exc_info);

py/objexcept.c

@@ -31,8 +31,6 @@
 #include <stdio.h>
 
 #include "py/objlist.h"
-// CIRCUITPY-CHANGE
-#include "py/objnamedtuple.h"
 #include "py/objstr.h"
 #include "py/objtuple.h"
 #include "py/objtype.h"
@@ -729,126 +727,3 @@ void mp_obj_exception_get_traceback(mp_obj_t self_in, size_t *n, size_t **values
         *values = self->traceback->data;
     }
 }
-
-// CIRCUITPY-CHANGE: here until end
-#if MICROPY_PY_SYS_EXC_INFO
-static const mp_obj_namedtuple_type_t code_type_obj = {
-    NAMEDTUPLE_TYPE_BASE_AND_SLOTS(MP_QSTR_code),
-    .n_fields = 15,
-    .fields = {
-        MP_QSTR_co_argcount,
-        MP_QSTR_co_kwonlyargcount,
-        MP_QSTR_co_nlocals,
-        MP_QSTR_co_stacksize,
-        MP_QSTR_co_flags,
-        MP_QSTR_co_code,
-        MP_QSTR_co_consts,
-        MP_QSTR_co_names,
-        MP_QSTR_co_varnames,
-        MP_QSTR_co_freevars,
-        MP_QSTR_co_cellvars,
-        MP_QSTR_co_filename,
-        MP_QSTR_co_name,
-        MP_QSTR_co_firstlineno,
-        MP_QSTR_co_lnotab,
-    },
-};
-
-static mp_obj_t code_make_new(qstr file, qstr block) {
-    mp_obj_t elems[15] = {
-        mp_obj_new_int(0),             // co_argcount
-        mp_obj_new_int(0),             // co_kwonlyargcount
-        mp_obj_new_int(0),             // co_nlocals
-        mp_obj_new_int(0),             // co_stacksize
-        mp_obj_new_int(0),             // co_flags
-        mp_obj_new_bytearray(0, NULL), // co_code
-        mp_obj_new_tuple(0, NULL),     // co_consts
-        mp_obj_new_tuple(0, NULL),     // co_names
-        mp_obj_new_tuple(0, NULL),     // co_varnames
-        mp_obj_new_tuple(0, NULL),     // co_freevars
-        mp_obj_new_tuple(0, NULL),     // co_cellvars
-        MP_OBJ_NEW_QSTR(file),         // co_filename
-        MP_OBJ_NEW_QSTR(block),        // co_name
-        mp_obj_new_int(1),             // co_firstlineno
-        mp_obj_new_bytearray(0, NULL), // co_lnotab
-    };
-
-    return namedtuple_make_new((const mp_obj_type_t *)&code_type_obj, 15, 0, elems);
-}
-
-static const mp_obj_namedtuple_type_t frame_type_obj = {
-    NAMEDTUPLE_TYPE_BASE_AND_SLOTS(MP_QSTR_frame),
-    .n_fields = 8,
-    .fields = {
-        MP_QSTR_f_back,
-        MP_QSTR_f_builtins,
-        MP_QSTR_f_code,
-        MP_QSTR_f_globals,
-        MP_QSTR_f_lasti,
-        MP_QSTR_f_lineno,
-        MP_QSTR_f_locals,
-        MP_QSTR_f_trace,
-    },
-};
-
-static mp_obj_t frame_make_new(mp_obj_t f_code, int f_lineno) {
-    mp_obj_t elems[8] = {
-        mp_const_none,             // f_back
-        mp_obj_new_dict(0),        // f_builtins
-        f_code,                    // f_code
-        mp_obj_new_dict(0),        // f_globals
-        mp_obj_new_int(0),         // f_lasti
-        mp_obj_new_int(f_lineno),  // f_lineno
-        mp_obj_new_dict(0),        // f_locals
-        mp_const_none,             // f_trace
-    };
-
-    return namedtuple_make_new((const mp_obj_type_t *)&frame_type_obj, 8, 0, elems);
-}
-
-static const mp_obj_namedtuple_type_t traceback_type_obj = {
-    NAMEDTUPLE_TYPE_BASE_AND_SLOTS(MP_QSTR_traceback),
-    .n_fields = 4,
-    .fields = {
-        MP_QSTR_tb_frame,
-        MP_QSTR_tb_lasti,
-        MP_QSTR_tb_lineno,
-        MP_QSTR_tb_next,
-    },
-};
-
-static mp_obj_t traceback_from_values(size_t *values, mp_obj_t tb_next) {
-    int lineno = values[1];
-
-    mp_obj_t elems[4] = {
-        frame_make_new(code_make_new(values[0], values[2]), lineno),
-        mp_obj_new_int(0),
-        mp_obj_new_int(lineno),
-        tb_next,
-    };
-
-    return namedtuple_make_new((const mp_obj_type_t *)&traceback_type_obj, 4, 0, elems);
-};
-
-mp_obj_t mp_obj_exception_get_traceback_obj(mp_obj_t self_in) {
-    mp_obj_exception_t *self = MP_OBJ_TO_PTR(self_in);
-
-    if (!mp_obj_is_exception_instance(self)) {
-        return mp_const_none;
-    }
-
-    size_t n, *values;
-    mp_obj_exception_get_traceback(self, &n, &values);
-    if (n == 0) {
-        return mp_const_none;
-    }
-
-    mp_obj_t tb_next = mp_const_none;
-
-    for (size_t i = 0; i < n; i += 3) {
-        tb_next = traceback_from_values(&values[i], tb_next);
-    }
-
-    return tb_next;
-}
-#endif