objstr: Slice indexing: support bytes properly.

pfalcon · pfalcon · commit 5ebd5f0f19bd · 2014-05-11T21:22:59.000+03:00
diff --git a/py/objstr.c b/py/objstr.c
@@ -332,6 +332,7 @@ STATIC mp_obj_t str_binary_op(int op, mp_obj_t lhs_in, mp_obj_t rhs_in) {
 }
 
 STATIC mp_obj_t str_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
+    mp_obj_type_t *type = mp_obj_get_type(self_in);
     GET_STR_DATA_LEN(self_in, self_data, self_len);
     if (value == MP_OBJ_SENTINEL) {
         // load
@@ -341,10 +342,9 @@ STATIC mp_obj_t str_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
             if (!mp_seq_get_fast_slice_indexes(self_len, index, &start, &stop)) {
                 assert(0);
             }
-            return mp_obj_new_str(self_data + start, stop - start, false);
+            return str_new(type, self_data + start, stop - start);
         }
 #endif
-        mp_obj_type_t *type = mp_obj_get_type(self_in);
         uint index_val = mp_get_index(type, self_len, index, false);
         if (type == &mp_type_bytes) {
             return MP_OBJ_NEW_SMALL_INT((mp_small_int_t)self_data[index_val]);
diff --git a/tests/basics/string-slice.py b/tests/basics/string-slice.py
@@ -30,3 +30,6 @@
 # No IndexError!
 print(""[1:1])
 print(""[-1:-1])
+
+# bytes
+print(b"123"[0:2])

Original file line number	Diff line number	Diff line change
`@@ -332,6 +332,7 @@ STATIC mp_obj_t str_binary_op(int op, mp_obj_t lhs_in, mp_obj_t rhs_in) {`
`332`	`332`	`}`
`333`	`333`
`334`	`334`	`STATIC mp_obj_t str_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {`
	`335`	`+ mp_obj_type_t *type = mp_obj_get_type(self_in);`
`335`	`336`	`GET_STR_DATA_LEN(self_in, self_data, self_len);`
`336`	`337`	`if (value == MP_OBJ_SENTINEL) {`
`337`	`338`	`// load`
`@@ -341,10 +342,9 @@ STATIC mp_obj_t str_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {`
`341`	`342`	`if (!mp_seq_get_fast_slice_indexes(self_len, index, &start, &stop)) {`
`342`	`343`	`assert(0);`
`343`	`344`	`}`
`344`		`- return mp_obj_new_str(self_data + start, stop - start, false);`
	`345`	`+ return str_new(type, self_data + start, stop - start);`
`345`	`346`	`}`
`346`	`347`	`#endif`
`347`		`- mp_obj_type_t *type = mp_obj_get_type(self_in);`
`348`	`348`	`uint index_val = mp_get_index(type, self_len, index, false);`
`349`	`349`	`if (type == &mp_type_bytes) {`
`350`	`350`	`return MP_OBJ_NEW_SMALL_INT((mp_small_int_t)self_data[index_val]);`