From c338883869a21884441ed6664c54fbfc1e19d96d Mon Sep 17 00:00:00 2001
From: moon2 <moon2protonmail@protonmail.com>
Date: Wed, 6 Nov 2024 15:07:55 +0100
Subject: [PATCH] third time wasn't the charm.
we're not very good at this :/
---
components/micropython/vendor/py/objdict.c | 8 ++++++--
components/micropython/vendor/py/objlist.c | 8 ++++++--
components/micropython/vendor/py/objtuple.c | 8 ++++++--
3 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/components/micropython/vendor/py/objdict.c b/components/micropython/vendor/py/objdict.c
index efcd617dad..60380963a4 100644
--- a/components/micropython/vendor/py/objdict.c
+++ b/components/micropython/vendor/py/objdict.c
@@ -95,7 +95,9 @@ STATIC void dict_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_
mp_print_str(print, "{");
size_t cur = 0;
mp_map_elem_t *next = NULL;
- MP_PRINT_GET_EXT(print)->indent_depth++;
+ if(kind == PRINT_JSON){
+ MP_PRINT_GET_EXT(print)->indent_depth++;
+ }
while ((next = dict_iter_next(self, &cur)) != NULL) {
if (!first) {
mp_print_str(print, item_separator);
@@ -113,7 +115,9 @@ STATIC void dict_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_
mp_print_str(print, key_separator);
mp_obj_print_helper(print, next->value, kind);
}
- MP_PRINT_GET_EXT(print)->indent_depth--;
+ if(kind == PRINT_JSON){
+ MP_PRINT_GET_EXT(print)->indent_depth--;
+ }
mp_print_indent(print, indent_str);
mp_print_str(print, "}");
if (MICROPY_PY_COLLECTIONS_ORDEREDDICT && self->base.type != &mp_type_dict && kind != PRINT_JSON) {
diff --git a/components/micropython/vendor/py/objlist.c b/components/micropython/vendor/py/objlist.c
index d9811724fc..333d3bd2a3 100644
--- a/components/micropython/vendor/py/objlist.c
+++ b/components/micropython/vendor/py/objlist.c
@@ -58,7 +58,9 @@ STATIC void list_print(const mp_print_t *print, mp_obj_t o_in, mp_print_kind_t k
}
mp_print_str(print, "[");
- MP_PRINT_GET_EXT(print)->indent_depth++;
+ if(kind == PRINT_JSON){
+ MP_PRINT_GET_EXT(print)->indent_depth++;
+ }
for (size_t i = 0; i < o->len; i++) {
if (i > 0) {
mp_print_str(print, item_separator);
@@ -66,7 +68,9 @@ STATIC void list_print(const mp_print_t *print, mp_obj_t o_in, mp_print_kind_t k
mp_print_indent(print, indent_str);
mp_obj_print_helper(print, o->items[i], kind);
}
- MP_PRINT_GET_EXT(print)->indent_depth--;
+ if(kind == PRINT_JSON){
+ MP_PRINT_GET_EXT(print)->indent_depth--;
+ }
mp_print_indent(print, indent_str);
mp_print_str(print, "]");
}
diff --git a/components/micropython/vendor/py/objtuple.c b/components/micropython/vendor/py/objtuple.c
index 6fe7f2d0ab..6b402ce71c 100644
--- a/components/micropython/vendor/py/objtuple.c
+++ b/components/micropython/vendor/py/objtuple.c
@@ -54,7 +54,9 @@ void mp_obj_tuple_print(const mp_print_t *print, mp_obj_t o_in, mp_print_kind_t
if(kind == PRINT_JSON){
indent_str = MP_PRINT_GET_EXT(print)->indent;
}
- MP_PRINT_GET_EXT(print)->indent_depth++;
+ if(kind == PRINT_JSON){
+ MP_PRINT_GET_EXT(print)->indent_depth++;
+ }
for (size_t i = 0; i < o->len; i++) {
if (i > 0) {
mp_print_str(print, item_separator);
@@ -62,7 +64,9 @@ void mp_obj_tuple_print(const mp_print_t *print, mp_obj_t o_in, mp_print_kind_t
mp_print_indent(print, indent_str);
mp_obj_print_helper(print, o->items[i], kind);
}
- MP_PRINT_GET_EXT(print)->indent_depth--;
+ if(kind == PRINT_JSON){
+ MP_PRINT_GET_EXT(print)->indent_depth--;
+ }
mp_print_indent(print, indent_str);
if (MICROPY_PY_UJSON && kind == PRINT_JSON) {
mp_print_str(print, "]");
--
GitLab