mirrors
/
micropython
mirror of https://github.com/micropython/micropython.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:dpgeorge/micropython

This commit is contained in:
Damien George 2014-01-04 12:35:26 +00:00
parent 2a5e6538b9 0be78d44e5
commit 32f88410a1
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
py/objstr.c
View File

@ -41,9 +41,20 @@ mp_obj_t str_binary_op(int op, mp_obj_t lhs_in, mp_obj_t rhs_in) {
int len = strlen(lhs_str); int len = strlen(lhs_str);
if (start < 0) { if (start < 0) {
start = len + start; start = len + start;
if (start < 0) {
start = 0;
}
} else if (start > len) {
start = len;
} }
if (stop <= 0) { if (stop <= 0) {
stop = len + stop; stop = len + stop;
// CPython returns empty string in such case
if (stop < 0) {
stop = start;
}
} else if (stop > len) {
stop = len;
} }
return mp_obj_new_str(qstr_from_strn_copy(lhs_str + start, stop - start)); return mp_obj_new_str(qstr_from_strn_copy(lhs_str + start, stop - start));
#endif #endif

5
tests/basics/tests/slice-bstr1.py
View File

@ -22,6 +22,11 @@ print(b"123"[0:])
print(b"123"[:0]) print(b"123"[:0])
print(b"123"[:-3]) print(b"123"[:-3])
print(b"123"[:-4]) print(b"123"[:-4])
# Range check testing, don't segfault, please ;-)
print(b"123"[:1000000])
print(b"123"[1000000:])
print(b"123"[:-1000000])
print(b"123"[-1000000:])
# No IndexError! # No IndexError!
print(b""[1:1]) print(b""[1:1])
print(b""[-1:-1]) print(b""[-1:-1])