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/objnone.c | |
| parent | c06763a0207dde7f2060f7b1670a0b99298a01f8 (diff) | |
| parent | fd04bb3bacf5dbc4d79c04a49520e3e81abb7352 (diff) | |
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/objnone.c')
| -rw-r--r-- | py/objnone.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/py/objnone.c b/py/objnone.c index c9a860dd0..dc93c25e2 100644 --- a/py/objnone.c +++ b/py/objnone.c @@ -18,7 +18,6 @@ const mp_obj_type_t none_type = { .base = { &mp_const_type }, .name = "NoneType", .print = none_print, - .methods = {{NULL, NULL},}, }; static const mp_obj_none_t none_obj = {{&none_type}}; |