diff options
author | John R. Lenton <jlenton@gmail.com> | 2014-01-07 23:06:46 +0000 |
---|---|---|
committer | John R. Lenton <jlenton@gmail.com> | 2014-01-07 23:06:46 +0000 |
commit | 9c83ec0edac2394431a5d1aecba1d666ffdea0a3 (patch) | |
tree | ccf18860da373cf13194788b793a962335d69fef /py/objslice.c | |
parent | 27d4ca7693c276d09a911c00c3442729c516dc23 (diff) | |
download | micropython-9c83ec0edac2394431a5d1aecba1d666ffdea0a3.tar.gz micropython-9c83ec0edac2394431a5d1aecba1d666ffdea0a3.zip |
Merge remote-tracking branch 'upstream/master' into dict_feats
Diffstat (limited to 'py/objslice.c')
-rw-r--r-- | py/objslice.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/py/objslice.c b/py/objslice.c index da69b92af2..d95ccef06f 100644 --- a/py/objslice.c +++ b/py/objslice.c @@ -23,14 +23,7 @@ void ellipsis_print(void (*print)(void *env, const char *fmt, ...), void *env, m const mp_obj_type_t ellipsis_type = { { &mp_const_type }, "ellipsis", - ellipsis_print, // print - NULL, // make_new - NULL, // call_n - NULL, // unary_op - NULL, // binary_op - NULL, // getiter - NULL, // iternext - .methods = {{NULL, NULL},}, + .print = ellipsis_print, }; static const mp_obj_ellipsis_t ellipsis_obj = {{&ellipsis_type}}; @@ -58,7 +51,6 @@ const mp_obj_type_t slice_type = { { &mp_const_type }, "slice", .print = slice_print, - .methods = { { NULL, NULL }, }, }; // TODO: Make sure to handle "empty" values, which are signified by None in CPython |