From 1c09a0b4947cfc7ce2b7ea89088658e6b7e956d4 Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Fri, 22 Sep 2023 13:53:56 -0500 Subject: [PATCH] fix string construction --- shared-bindings/struct/__init__.c | 2 +- shared-bindings/traceback/__init__.c | 2 +- shared-module/os/getenv.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/shared-bindings/struct/__init__.c b/shared-bindings/struct/__init__.c index 7434e85cf9..a729f0d2ab 100644 --- a/shared-bindings/struct/__init__.c +++ b/shared-bindings/struct/__init__.c @@ -73,7 +73,7 @@ STATIC mp_obj_t struct_pack(size_t n_args, const mp_obj_t *args) { memset(p, 0, size); byte *end_p = &p[size]; shared_modules_struct_pack_into(args[0], p, end_p, n_args - 1, &args[1]); - return mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr); + return mp_obj_new_bytes_from_vstr(&vstr); } MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(struct_pack_obj, 1, MP_OBJ_FUN_ARGS_MAX, struct_pack); diff --git a/shared-bindings/traceback/__init__.c b/shared-bindings/traceback/__init__.c index ca34161842..773a41904d 100644 --- a/shared-bindings/traceback/__init__.c +++ b/shared-bindings/traceback/__init__.c @@ -158,7 +158,7 @@ STATIC mp_obj_t traceback_format_exception(size_t n_args, const mp_obj_t *pos_ar vstr_t vstr; vstr_init_print(&vstr, 0, &print); traceback_exception_common(false, &print, n_args, pos_args, kw_args); - mp_obj_t output = mp_obj_new_str_from_vstr(&mp_type_str, &vstr); + mp_obj_t output = mp_obj_new_str_from_vstr(&vstr); return mp_obj_new_list(1, &output); } diff --git a/shared-module/os/getenv.c b/shared-module/os/getenv.c index 7b102fd3e5..7fba522256 100644 --- a/shared-module/os/getenv.c +++ b/shared-module/os/getenv.c @@ -392,7 +392,7 @@ mp_obj_t common_hal_os_getenv_path(const char *path, const char *key, mp_obj_t d handle_getenv_error(result, mp_raise_msg_varg); if (quoted) { - return mp_obj_new_str_from_vstr(&mp_type_str, &buf); + return mp_obj_new_str_from_vstr(&buf); } else { return mp_parse_num_integer(buf.buf, buf.len, 0, NULL); }