diff options
| author | John R. Lenton <jlenton@gmail.com> | 2014-01-07 18:01:08 +0000 |
|---|---|---|
| committer | John R. Lenton <jlenton@gmail.com> | 2014-01-07 18:01:08 +0000 |
| commit | 270112f7312f724e46ae34649dfce3ec43b697e0 (patch) | |
| tree | d7438ae877350aede062d8ac7e62e52ab35cb018 /py/objexcept.c | |
| parent | c06763a0207dde7f2060f7b1670a0b99298a01f8 (diff) | |
| parent | fd04bb3bacf5dbc4d79c04a49520e3e81abb7352 (diff) | |
| download | micropython-270112f7312f724e46ae34649dfce3ec43b697e0.tar.gz micropython-270112f7312f724e46ae34649dfce3ec43b697e0.zip | |
Merge remote-tracking branch 'upstream/master' into listsort. Lots of conflict fun.
Conflicts:
py/obj.h
py/objbool.c
py/objboundmeth.c
py/objcell.c
py/objclass.c
py/objclosure.c
py/objcomplex.c
py/objdict.c
py/objexcept.c
py/objfun.c
py/objgenerator.c
py/objinstance.c
py/objmodule.c
py/objrange.c
py/objset.c
py/objslice.c
Diffstat (limited to 'py/objexcept.c')
| -rw-r--r-- | py/objexcept.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/py/objexcept.c b/py/objexcept.c index dca375dda0..829b147853 100644 --- a/py/objexcept.c +++ b/py/objexcept.c @@ -36,10 +36,9 @@ void exception_print(void (*print)(void *env, const char *fmt, ...), void *env, } const mp_obj_type_t exception_type = { - .base = { &mp_const_type }, - .name = "exception", + { &mp_const_type }, + "exception", .print = exception_print, - .methods = {{NULL, NULL},}, }; mp_obj_t mp_obj_new_exception(qstr id) { |