commit e62a0fe36776f039149e7fab77323aa380b97c2e
author Paul Sokolovsky <pfalcon@users.sourceforge.net> Thu Oct 30 23:58:08 2014 +0200
committer Paul Sokolovsky <pfalcon@users.sourceforge.net> Fri Oct 31 00:03:53 2014 +0200
tree ccc4552c55bcc250365c3347c662ab5ecf72161f
parent 31619cc5893b8066799e663683ea9a7ea29602e1

objstr: Allow to convert any buffer proto object to str.

Original motivation is to support converting bytearrays, but easier to just
support buffer protocol at all.

py/objstrunicode.c

diff --git a/py/objstrunicode.c b/py/objstrunicode.c
index 062e011..2c8d024 100644
--- a/py/objstrunicode.c
+++ b/py/objstrunicode.c
@@ -142,15 +142,18 @@
         case 3:
         {
             // TODO: validate 2nd/3rd args
-            if (!MP_OBJ_IS_TYPE(args[0], &mp_type_bytes)) {
-                nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError, "bytes expected"));
+            if (MP_OBJ_IS_TYPE(args[0], &mp_type_bytes)) {
+                GET_STR_DATA_LEN(args[0], str_data, str_len);
+                GET_STR_HASH(args[0], str_hash);
+                mp_obj_str_t *o = mp_obj_new_str_of_type(&mp_type_str, NULL, str_len);
+                o->data = str_data;
+                o->hash = str_hash;
+                return o;
+            } else {
+                mp_buffer_info_t bufinfo;
+                mp_get_buffer_raise(args[0], &bufinfo, MP_BUFFER_READ);
+                return mp_obj_new_str(bufinfo.buf, bufinfo.len, false);
             }
-            GET_STR_DATA_LEN(args[0], str_data, str_len);
-            GET_STR_HASH(args[0], str_hash);
-            mp_obj_str_t *o = mp_obj_new_str_of_type(&mp_type_str, NULL, str_len);
-            o->data = str_data;
-            o->hash = str_hash;
-            return o;
         }
 
         default: