Skip to content

Commit cc7085c

Browse files
committed
Merge branch 'fix-format-int' of github.com:dhylands/micropython into dhylands-fix-format-int
Conflicts: py/objstr.c
2 parents c322c5f + 22fe4d7 commit cc7085c

1 file changed

Lines changed: 2 additions & 0 deletions

File tree

py/objstr.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -790,6 +790,8 @@ mp_obj_t str_format(uint n_args, const mp_obj_t *args) {
790790
}
791791
}
792792

793+
// NOTE: no else here. We need the e, f, g etc formats for integer
794+
// arguments (from above if) to take this if.
793795
if (arg_looks_numeric(arg)) {
794796
if (!type) {
795797

0 commit comments

Comments
 (0)