diff options
| author | Paul Sokolovsky <pfalcon@users.sourceforge.net> | 2014-06-14 01:19:52 +0300 |
|---|---|---|
| committer | Paul Sokolovsky <pfalcon@users.sourceforge.net> | 2014-06-27 00:04:18 +0300 |
| commit | cdc020da4b3da88418e248b8b4bca2247d238923 (patch) | |
| tree | 0a91887454906453f48afe792ac18482b854c7ad /py | |
| parent | e7f2b4c875fa3130e4ad37721a7d231380456895 (diff) | |
| download | micropython-cdc020da4b3da88418e248b8b4bca2247d238923.tar.gz micropython-cdc020da4b3da88418e248b8b4bca2247d238923.zip | |
objstrunicode: Re-add buffer protocol back for now, required for io.StringIO.
Diffstat (limited to 'py')
| -rw-r--r-- | py/objstr.c | 2 | ||||
| -rw-r--r-- | py/objstr.h | 1 | ||||
| -rw-r--r-- | py/objstrunicode.c | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/py/objstr.c b/py/objstr.c index 39b0359109..acbf002837 100644 --- a/py/objstr.c +++ b/py/objstr.c @@ -1601,7 +1601,7 @@ STATIC mp_obj_t str_encode(uint n_args, const mp_obj_t *args) { } #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; diff --git a/py/objstr.h b/py/objstr.h index 2e5aaeb095..75de50d29b 100644 --- a/py/objstr.h +++ b/py/objstr.h @@ -55,6 +55,7 @@ mp_obj_t mp_obj_str_format(uint n_args, const mp_obj_t *args); 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); diff --git a/py/objstrunicode.c b/py/objstrunicode.c index 8fbe81532a..e6ca35acbf 100644 --- a/py/objstrunicode.c +++ b/py/objstrunicode.c @@ -313,7 +313,7 @@ const mp_obj_type_t mp_type_str = { .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, }; |