py: Use mp_not_implemented consistently for not implemented features.

dpgeorge · dpgeorge · commit 821b7f22fec3 · 2015-09-03T23:14:06.000+01:00
diff --git a/py/argcheck.c b/py/argcheck.c
@@ -146,7 +146,6 @@ NORETURN void mp_arg_error_terse_mismatch(void) {
 
 #if MICROPY_CPYTHON_COMPAT
 NORETURN void mp_arg_error_unimpl_kw(void) {
-    nlr_raise(mp_obj_new_exception_msg(&mp_type_NotImplementedError,
-        "keyword argument(s) not yet implemented - use normal args instead"));
+    mp_not_implemented("keyword argument(s) not yet implemented - use normal args instead");
 }
 #endif
diff --git a/py/objarray.c b/py/objarray.c
@@ -365,8 +365,7 @@ STATIC mp_obj_t array_subscr(mp_obj_t self_in, mp_obj_t index_in, mp_obj_t value
         } else if (MP_OBJ_IS_TYPE(index_in, &mp_type_slice)) {
             mp_bound_slice_t slice;
             if (!mp_seq_get_fast_slice_indexes(o->len, index_in, &slice)) {
-                nlr_raise(mp_obj_new_exception_msg(&mp_type_NotImplementedError,
-                    "only slices with step=1 (aka None) are supported"));
+                mp_not_implemented("only slices with step=1 (aka None) are supported");
             }
             if (value != MP_OBJ_SENTINEL) {
                 #if MICROPY_PY_ARRAY_SLICE_ASSIGN
diff --git a/py/objstr.c b/py/objstr.c
@@ -391,8 +391,7 @@ STATIC mp_obj_t bytes_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
         if (MP_OBJ_IS_TYPE(index, &mp_type_slice)) {
             mp_bound_slice_t slice;
             if (!mp_seq_get_fast_slice_indexes(self_len, index, &slice)) {
-                nlr_raise(mp_obj_new_exception_msg(&mp_type_NotImplementedError,
-                    "only slices with step=1 (aka None) are supported"));
+                mp_not_implemented("only slices with step=1 (aka None) are supported");
             }
             return mp_obj_new_str_of_type(type, self_data + slice.start, slice.stop - slice.start);
         }
@@ -975,7 +974,7 @@ mp_obj_t mp_obj_str_format(mp_uint_t n_args, const mp_obj_t *args, mp_map_t *kwa
                 arg = key_elem->value;
             }
             if (*lookup) {
-                nlr_raise(mp_obj_new_exception_msg(&mp_type_NotImplementedError, "attributes not supported yet"));
+                mp_not_implemented("attributes not supported yet");
             }
             vstr_free(field_name);
             field_name = NULL;
diff --git a/py/objstrunicode.c b/py/objstrunicode.c
@@ -178,8 +178,7 @@ STATIC mp_obj_t str_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
             mp_obj_t ostart, ostop, ostep;
             mp_obj_slice_get(index, &ostart, &ostop, &ostep);
             if (ostep != mp_const_none && ostep != MP_OBJ_NEW_SMALL_INT(1)) {
-                nlr_raise(mp_obj_new_exception_msg(&mp_type_NotImplementedError,
-                    "only slices with step=1 (aka None) are supported"));
+                mp_not_implemented("only slices with step=1 (aka None) are supported");
             }
 
             const byte *pstart, *pstop;
diff --git a/py/objtuple.c b/py/objtuple.c
@@ -183,8 +183,7 @@ mp_obj_t mp_obj_tuple_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
         if (MP_OBJ_IS_TYPE(index, &mp_type_slice)) {
             mp_bound_slice_t slice;
             if (!mp_seq_get_fast_slice_indexes(self->len, index, &slice)) {
-                nlr_raise(mp_obj_new_exception_msg(&mp_type_NotImplementedError,
-                    "only slices with step=1 (aka None) are supported"));
+                mp_not_implemented("only slices with step=1 (aka None) are supported");
             }
             mp_obj_tuple_t *res = mp_obj_new_tuple(slice.stop - slice.start, NULL);
             mp_seq_copy(res->items, self->items + slice.start, res->len, mp_obj_t);

Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,6 @@ NORETURN void mp_arg_error_terse_mismatch(void) {`
`146`	`146`
`147`	`147`	`#if MICROPY_CPYTHON_COMPAT`
`148`	`148`	`NORETURN void mp_arg_error_unimpl_kw(void) {`
`149`		`- nlr_raise(mp_obj_new_exception_msg(&mp_type_NotImplementedError,`
`150`		`- "keyword argument(s) not yet implemented - use normal args instead"));`
	`149`	`+ mp_not_implemented("keyword argument(s) not yet implemented - use normal args instead");`
`151`	`150`	`}`
`152`	`151`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -391,8 +391,7 @@ STATIC mp_obj_t bytes_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {`
`391`	`391`	`if (MP_OBJ_IS_TYPE(index, &mp_type_slice)) {`
`392`	`392`	`mp_bound_slice_t slice;`
`393`	`393`	`if (!mp_seq_get_fast_slice_indexes(self_len, index, &slice)) {`
`394`		`- nlr_raise(mp_obj_new_exception_msg(&mp_type_NotImplementedError,`
`395`		`- "only slices with step=1 (aka None) are supported"));`
	`394`	`+ mp_not_implemented("only slices with step=1 (aka None) are supported");`
`396`	`395`	`}`
`397`	`396`	`return mp_obj_new_str_of_type(type, self_data + slice.start, slice.stop - slice.start);`
`398`	`397`	`}`
`@@ -975,7 +974,7 @@ mp_obj_t mp_obj_str_format(mp_uint_t n_args, const mp_obj_t args, mp_map_t kwa`
`975`	`974`	`arg = key_elem->value;`
`976`	`975`	`}`
`977`	`976`	`if (*lookup) {`
`978`		`- nlr_raise(mp_obj_new_exception_msg(&mp_type_NotImplementedError, "attributes not supported yet"));`
	`977`	`+ mp_not_implemented("attributes not supported yet");`
`979`	`978`	`}`
`980`	`979`	`vstr_free(field_name);`
`981`	`980`	`field_name = NULL;`
Original file line number	Diff line number	Diff line change
`@@ -178,8 +178,7 @@ STATIC mp_obj_t str_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {`
`178`	`178`	`mp_obj_t ostart, ostop, ostep;`
`179`	`179`	`mp_obj_slice_get(index, &ostart, &ostop, &ostep);`
`180`	`180`	`if (ostep != mp_const_none && ostep != MP_OBJ_NEW_SMALL_INT(1)) {`
`181`		`- nlr_raise(mp_obj_new_exception_msg(&mp_type_NotImplementedError,`
`182`		`- "only slices with step=1 (aka None) are supported"));`
	`181`	`+ mp_not_implemented("only slices with step=1 (aka None) are supported");`
`183`	`182`	`}`
`184`	`183`
`185`	`184`	`const byte pstart, pstop;`