commit 2eb1f604ee3a1b7284ae23581a9c0e2d1e9066a1
author Damien George <damien.p.george@gmail.com> Mon Aug 11 23:24:29 2014 +0100
committer Damien George <damien.p.george@gmail.com> Mon Aug 11 23:24:29 2014 +0100
tree 03f36305ad8402cd9ac6dd5af3ec551758c10756
parent 7703d719380833a5d59fb7ca5087a2d8172b3529

py, objstr: Optimise bytes subscr when unicode is enabled.

Saves code bytes and makes it faster, so why not?

py/objstr.c

diff --git a/py/objstr.c b/py/objstr.c
index fb170f8..35bb8e7 100644
--- a/py/objstr.c
+++ b/py/objstr.c
@@ -370,7 +370,8 @@
         }
 #endif
         mp_uint_t index_val = mp_get_index(type, self_len, index, false);
-        if (type == &mp_type_bytes) {
+        // If we have unicode enabled the type will always be bytes, so take the short cut.
+        if (MICROPY_PY_BUILTINS_STR_UNICODE || type == &mp_type_bytes) {
             return MP_OBJ_NEW_SMALL_INT(self_data[index_val]);
         } else {
             return mp_obj_new_str((char*)&self_data[index_val], 1, true);