Commit cc7085c1 authored by Damien George's avatar Damien George
Browse files

Merge branch 'fix-format-int' of github.com:dhylands/micropython into dhylands-fix-format-int

Conflicts:
	py/objstr.c
parents c322c5f0 22fe4d73
......@@ -790,6 +790,8 @@ mp_obj_t str_format(uint n_args, const mp_obj_t *args) {
}
}
// NOTE: no else here. We need the e, f, g etc formats for integer
// arguments (from above if) to take this if.
if (arg_looks_numeric(arg)) {
if (!type) {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment