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

pfalcon · pfalcon · commit eea01186547f · 2014-05-11T13:51:24.000+03:00
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.
diff --git a/py/objstr.c b/py/objstr.c
@@ -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) {
-    if (MP_OBJ_IS_STR(self_in)) {
+    if (is_str_or_bytes(self_in)) {
         GET_STR_DATA_LEN(self_in, s, l);
         *len = l;
         return (const char*)s;
diff --git a/tests/basics/int1.py b/tests/basics/int1.py
@@ -46,6 +46,7 @@
 print(int('0100', 2))
 print(int(' \t 0o12', 8))
 print(int('0o12  \t  ', 8))
+print(int(b"12", 10))
 
 
 def test(value, base):

Original file line number	Diff line number	Diff line change
`@@ -1647,7 +1647,7 @@ const char *mp_obj_str_get_str(mp_obj_t self_in) {`
`1647`	`1647`	`}`
`1648`	`1648`
`1649`	`1649`	`const char mp_obj_str_get_data(mp_obj_t self_in, uint len) {`
`1650`		`- if (MP_OBJ_IS_STR(self_in)) {`
	`1650`	`+ if (is_str_or_bytes(self_in)) {`
`1651`	`1651`	`GET_STR_DATA_LEN(self_in, s, l);`
`1652`	`1652`	`*len = l;`
`1653`	`1653`	`return (const char*)s;`