diff options
| author | Damien George <damien.p.george@gmail.com> | 2014-04-10 12:58:31 +0100 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2014-04-10 12:58:31 +0100 |
| commit | 3a8b1607fcbffdbff0a0001d6baacea7693d15b9 (patch) | |
| tree | 359d2b30a91c4ffc37ce2ce2734abfa6331d6dd3 /py/objstr.c | |
| parent | 635543c72cc9ccfb20c1ec1f64d329eef35ebe2d (diff) | |
| parent | 978607aeffb5b1deca3a4ad4b0ab0d0e15b5e271 (diff) | |
| download | micropython-3a8b1607fcbffdbff0a0001d6baacea7693d15b9.tar.gz micropython-3a8b1607fcbffdbff0a0001d6baacea7693d15b9.zip | |
Merge branch 'master' of github.com:micropython/micropython
Diffstat (limited to 'py/objstr.c')
| -rw-r--r-- | py/objstr.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/py/objstr.c b/py/objstr.c index 519ff464d6..39c24205be 100644 --- a/py/objstr.c +++ b/py/objstr.c @@ -330,6 +330,7 @@ STATIC mp_obj_t str_join(mp_obj_t self_in, mp_obj_t arg) { } else { if (!MP_OBJ_IS_TYPE(arg, &mp_type_list)) { // arg is not a list, try to convert it to one + // TODO: Try to optimize? arg = mp_type_list.make_new((mp_obj_t)&mp_type_list, 1, 0, &arg); } mp_obj_list_get(arg, &seq_len, &seq_items); |