diff options
| author | Damien George <damien.p.george@gmail.com> | 2014-04-02 20:37:05 +0100 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2014-04-02 20:37:05 +0100 |
| commit | cc7085c1cecc6d46197f1472eb64f18453f3db25 (patch) | |
| tree | ecc5e7d30da1f7deecd8cbb53217b0e0f69f3a2e /py | |
| parent | c322c5f07f3a22e2c815bb9d4f3dcc5d6ace082a (diff) | |
| parent | 22fe4d7344674d3604bd9016115503bcc8822fc8 (diff) | |
| download | micropython-cc7085c1cecc6d46197f1472eb64f18453f3db25.tar.gz micropython-cc7085c1cecc6d46197f1472eb64f18453f3db25.zip | |
Merge branch 'fix-format-int' of github.com:dhylands/micropython into dhylands-fix-format-int
Conflicts:
py/objstr.c
Diffstat (limited to 'py')
| -rw-r--r-- | py/objstr.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/py/objstr.c b/py/objstr.c index c27b19939d..a3f2d6075d 100644 --- a/py/objstr.c +++ b/py/objstr.c @@ -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) { |