Skip to content

Commit 7f2c1ae

Browse files
authored
Merge pull request #184 from v923z/slice-patch
wrong type in indexing raises TypeError now
2 parents 04fa205 + ee8b72a commit 7f2c1ae

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

code/ndarray.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -769,7 +769,7 @@ static mp_obj_t ndarray_get_slice(ndarray_obj_t *ndarray, mp_obj_t index, ndarra
769769
!MP_OBJ_IS_TYPE(index, &mp_type_list) &&
770770
!MP_OBJ_IS_TYPE(index, &mp_type_slice) &&
771771
!MP_OBJ_IS_INT(index)) {
772-
mp_raise_msg(&mp_type_IndexError, translate("indices must be integers, slices, or Boolean lists"));
772+
mp_raise_TypeError(translate("indices must be integers, slices, or Boolean lists"));
773773
}
774774

775775
size_t m = 0, n = 0;
@@ -814,7 +814,7 @@ static mp_obj_t ndarray_get_slice(ndarray_obj_t *ndarray, mp_obj_t index, ndarra
814814
!(MP_OBJ_IS_TYPE(tuple->items[1], &mp_type_list) ||
815815
MP_OBJ_IS_TYPE(tuple->items[1], &mp_type_slice) ||
816816
MP_OBJ_IS_INT(tuple->items[1]))) {
817-
mp_raise_msg(&mp_type_IndexError, translate("indices must be integers, slices, or Boolean lists"));
817+
mp_raise_TypeError(translate("indices must be integers, slices, or Boolean lists"));
818818
}
819819
if(MP_OBJ_IS_TYPE(tuple->items[0], &mp_type_list)) { // rows are indexed by Boolean list
820820
m = true_length(tuple->items[0]);

code/ulab.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
#include "user/user.h"
3333
#include "vector/vectorise.h"
3434

35-
STATIC MP_DEFINE_STR_OBJ(ulab_version_obj, "0.54.4");
35+
STATIC MP_DEFINE_STR_OBJ(ulab_version_obj, "0.54.5");
3636

3737
MP_DEFINE_CONST_FUN_OBJ_KW(ndarray_flatten_obj, 1, ndarray_flatten);
3838

docs/ulab-change-log.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
Sat, 25 Oct 2020
2+
3+
version 0.54.5
4+
5+
wrong type in slices raise TypeError exception
6+
17
Fri, 23 Oct 2020
28

39
version 0.54.4

0 commit comments

Comments
 (0)