From aa8d465d491720dcb1e7fc98575355a24b527c6b Mon Sep 17 00:00:00 2001 From: selfisekai Date: Fri, 18 Sep 2020 18:49:05 +0200 Subject: [PATCH] dump_qs: don't add None values to qs when nested in dict/list --- librefi/utils.py | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/librefi/utils.py b/librefi/utils.py index 406a31a..4b2cd6a 100644 --- a/librefi/utils.py +++ b/librefi/utils.py @@ -112,17 +112,19 @@ def dump_qs(obj): qs.append((old_qs_element[0], old_qs_element[1])) elif isinstance(old_qs_element[1], (dict)): for subkey in old_qs_element[1]: - qs.append( - (old_qs_element[0] + "[" + subkey + "]", old_qs_element[1][subkey])) - if isinstance(old_qs_element[1][subkey], (dict, list)): - not_flat = True + if old_qs_element[1][subkey] is not None: + qs.append( + (old_qs_element[0] + "[" + subkey + "]", old_qs_element[1][subkey])) + if isinstance(old_qs_element[1][subkey], (dict, list)): + not_flat = True elif isinstance(old_qs_element[1], (list)): for index in range(len(old_qs_element[1])): element = old_qs_element[1][index] - qs.append( - (old_qs_element[0] + "[" + str(index) + "]", element)) - if isinstance(element, (dict, list)): - not_flat = True + if element is not None: + qs.append( + (old_qs_element[0] + "[" + str(index) + "]", element)) + if isinstance(element, (dict, list)): + not_flat = True if not_flat: old_qs = qs qs = []