mirrors
/
micropython
mirror of https://github.com/micropython/micropython.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:micropython/micropython

This commit is contained in:
Damien George 2014-04-05 17:19:03 +01:00
parent 95004e5114 e99841be69
commit 6d508666ea
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
py/obj.c
View File

@ -181,6 +181,9 @@ bool mp_obj_equal(mp_obj_t o1, mp_obj_t o2) {
} }
machine_int_t mp_obj_get_int(mp_obj_t arg) { machine_int_t mp_obj_get_int(mp_obj_t arg) {
// This function essentially performs implicit type conversion to int
// Note that Python does NOT provide implicit type conversion from
// float to int in the core expression language, try some_list[1.0].
if (arg == mp_const_false) { if (arg == mp_const_false) {
return 0; return 0;
} else if (arg == mp_const_true) { } else if (arg == mp_const_true) {