commit cdc020da4b3da88418e248b8b4bca2247d238923
author Paul Sokolovsky <pfalcon@users.sourceforge.net> Sat Jun 14 01:19:52 2014 +0300
committer Paul Sokolovsky <pfalcon@users.sourceforge.net> Fri Jun 27 00:04:18 2014 +0300
tree 0a91887454906453f48afe792ac18482b854c7ad
parent e7f2b4c875fa3130e4ad37721a7d231380456895

objstrunicode: Re-add buffer protocol back for now, required for io.StringIO.

py/objstr.c

diff --git a/py/objstr.c b/py/objstr.c
index 39b0359..acbf002 100644
--- a/py/objstr.c
+++ b/py/objstr.c
@@ -1601,7 +1601,7 @@
 }
 #endif
 
-STATIC machine_int_t str_get_buffer(mp_obj_t self_in, mp_buffer_info_t *bufinfo, int flags) {
+machine_int_t str_get_buffer(mp_obj_t self_in, mp_buffer_info_t *bufinfo, int flags) {
     if (flags == MP_BUFFER_READ) {
         GET_STR_DATA_LEN(self_in, str_data, str_len);
         bufinfo->buf = (void*)str_data;

py/objstr.h

diff --git a/py/objstr.h b/py/objstr.h
index 2e5aaeb..75de50d 100644
--- a/py/objstr.h
+++ b/py/objstr.h
@@ -55,6 +55,7 @@
 mp_obj_t mp_obj_new_str_of_type(const mp_obj_type_t *type, const byte* data, uint len);
 
 mp_obj_t str_binary_op(int op, mp_obj_t lhs_in, mp_obj_t rhs_in);
+machine_int_t str_get_buffer(mp_obj_t self_in, mp_buffer_info_t *bufinfo, int flags);
 
 MP_DECLARE_CONST_FUN_OBJ(str_encode_obj);
 MP_DECLARE_CONST_FUN_OBJ(str_find_obj);

py/objstrunicode.c

diff --git a/py/objstrunicode.c b/py/objstrunicode.c
index 8fbe815..e6ca35a 100644
--- a/py/objstrunicode.c
+++ b/py/objstrunicode.c
@@ -313,7 +313,7 @@
     .binary_op = str_binary_op,
     .subscr = str_subscr,
     .getiter = mp_obj_new_str_iterator,
-//    .buffer_p = { .get_buffer = str_get_buffer },
+    .buffer_p = { .get_buffer = str_get_buffer },
     .locals_dict = (mp_obj_t)&str_locals_dict,
 };