TonBERRY/micropython
3
0
Fork 0
Code Pull Requests Activity

py: Fix up so that it can compile without float.

Browse Source
This commit is contained in:
Damien George
2014-04-02 17:06:05 +01:00
parent af6edc61bd
commit 70f33cde48
4 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
py/objstr.c
View File

@@ -788,9 +788,9 @@ mp_obj_t str_format(uint n_args, const mp_obj_t *args) {
nlr_jump(mp_obj_new_exception_msg_varg(&mp_type_ValueError,
"Unknown format code '%c' for object of type '%s'", type, mp_obj_get_type_str(arg)));
}
}
#if MICROPY_ENABLE_FLOAT
if (arg_looks_numeric(arg)) {
} else if (arg_looks_numeric(arg)) {
if (!type) {
// Even though the docs say that an unspecified type is the same
@@ -848,10 +848,14 @@ mp_obj_t str_format(uint n_args, const mp_obj_t *args) {
type, mp_obj_get_type_str(arg)));
}
#endif
} else {
// arg doesn't look like a number
if (align == '=') {
nlr_jump(mp_obj_new_exception_msg(&mp_type_ValueError, "'=' alignment not allowed in string format specifier"));
}
switch (type) {
case '\0':
mp_obj_print_helper((void (*)(void*, const char*, ...))vstr_printf, vstr, arg, PRINT_STR);