TonBERRY/micropython
3
0
Fork 0
Code Pull Requests Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Rachel Dowdall
2014-03-22 12:17:36 +00:00
parent 300c8bd4c2 da8d21e0dd
commit 17f45d41fe
42 changed files with 1274 additions and 246 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
py/objfloat.c
View File

@@ -39,10 +39,12 @@ STATIC mp_obj_t float_make_new(mp_obj_t type_in, uint n_args, uint n_kw, const m
// a string, parse it
uint l;
const char *s = mp_obj_str_get_data(args[0], &l);
return mp_parse_num_decimal(s, l);
return mp_parse_num_decimal(s, l, false, false);
} else if (MP_OBJ_IS_TYPE(args[0], &mp_type_float)) {
// a float, just return it
return args[0];
} else {
// something else, try to cast it to a float
return mp_obj_new_float(mp_obj_get_float(args[0]));
}