diff options
author | Damien George <damien.p.george@gmail.com> | 2014-04-01 10:48:58 +0100 |
---|---|---|
committer | Damien George <damien.p.george@gmail.com> | 2014-04-01 10:48:58 +0100 |
commit | 46330bd9b52bdd8865be62c1f6c534ef7709b842 (patch) | |
tree | dc531b159f6e5d3c3940e5fad752df9692e4ec60 /py/obj.c | |
parent | e44d26ae0c1b5d248fa4db112cdeabe404944f3c (diff) | |
parent | baf6f14deb567ab626c1b05213af346108f41700 (diff) | |
download | micropython-46330bd9b52bdd8865be62c1f6c534ef7709b842.tar.gz micropython-46330bd9b52bdd8865be62c1f6c534ef7709b842.zip |
Merge pull request #407 from dhylands/str-format
Enhance str.format support
Diffstat (limited to 'py/obj.c')
-rw-r--r-- | py/obj.c | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -198,6 +198,10 @@ machine_int_t mp_obj_get_int(mp_obj_t arg) { return MP_OBJ_SMALL_INT_VALUE(arg); } else if (MP_OBJ_IS_TYPE(arg, &mp_type_int)) { return mp_obj_int_get_checked(arg); +#if MICROPY_ENABLE_FLOAT + } else if (MP_OBJ_IS_TYPE(arg, &mp_type_float)) { + return mp_obj_float_get(arg); +#endif } else { nlr_jump(mp_obj_new_exception_msg_varg(&mp_type_TypeError, "can't convert %s to int", mp_obj_get_type_str(arg))); } |