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

py: Give up and make mp_obj_str_get_data() deal with bytes too. 

This is not fully correct re: error handling, because we should check that
that types are used consistently (only str's or only bytes), but magically
makes lot of functions support bytes.
This commit is contained in:
Paul Sokolovsky 2014-05-11 13:51:24 +03:00
parent b2d4fc06fc
commit eea0118654
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
py/objstr.c
View File

@ -1647,7 +1647,7 @@ const char *mp_obj_str_get_str(mp_obj_t self_in) {
} }
const char *mp_obj_str_get_data(mp_obj_t self_in, uint *len) { const char *mp_obj_str_get_data(mp_obj_t self_in, uint *len) {
if (MP_OBJ_IS_STR(self_in)) { if (is_str_or_bytes(self_in)) {
GET_STR_DATA_LEN(self_in, s, l); GET_STR_DATA_LEN(self_in, s, l);
*len = l; *len = l;
return (const char*)s; return (const char*)s;

1
tests/basics/int1.py
View File

@ -46,6 +46,7 @@ print(int('0B100', 2))
print(int('0100', 2)) print(int('0100', 2))
print(int(' \t 0o12', 8)) print(int(' \t 0o12', 8))
print(int('0o12 \t ', 8)) print(int('0o12 \t ', 8))
print(int(b"12", 10))
def test(value, base): def test(value, base):