Lerking/micropython
1
0
Fork 0
mirror of https://github.com/micropython/micropython.git synced 2026-01-08 13:10:21 +01:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into list_count

Browse Source
This commit is contained in:
John R. Lenton
2014-01-04 12:52:07 +00:00
parent a58cf679ee 32f88410a1
commit ff9a24f6f7
3 changed files with 31 additions and 2 deletions
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);
if (start < 0) {
start = len + start;
if (start < 0) {
start = 0;
}
} else if (start > len) {
start = len;
}
if (stop <= 0) {
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));
#endif