diff options
| author | Damien George <damien.p.george@gmail.com> | 2014-08-27 09:13:15 +0100 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2014-08-27 09:13:15 +0100 |
| commit | ad4c014d461cf325712d961c547f461746f52408 (patch) | |
| tree | c898437b7c2a717d74699c4ca305963a9e056879 /py/objint.c | |
| parent | f3c3010ffccc6cee0795c0491e2a686994bd0b34 (diff) | |
| parent | b7f7c655ed4b54d9ff8ec04908199d04d38b7528 (diff) | |
Merge branch 'int-bytes' of https://github.com/dhylands/micropython into dhylands-int-bytes
Diffstat (limited to 'py/objint.c')
| -rw-r--r-- | py/objint.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/py/objint.c b/py/objint.c index d088ae1a8..a77138350 100644 --- a/py/objint.c +++ b/py/objint.c @@ -57,7 +57,7 @@ STATIC mp_obj_t mp_obj_int_make_new(mp_obj_t type_in, uint n_args, uint n_kw, co if (MP_OBJ_IS_INT(args[0])) { // already an int (small or long), just return it return args[0]; - } else if (MP_OBJ_IS_STR(args[0])) { + } else if (MP_OBJ_IS_STR_OR_BYTES(args[0])) { // a string, parse it uint l; const char *s = mp_obj_str_get_data(args[0], &l); |