From 75cdf72e2162430df74e8c2e1410fb0517d5ec02 Mon Sep 17 00:00:00 2001 From: quadrismegistus Date: Mon, 7 Sep 2020 22:50:22 +0100 Subject: [PATCH] updates --- komrade/utils.py | 38 ++------------------------------------ 1 file changed, 2 insertions(+), 36 deletions(-) diff --git a/komrade/utils.py b/komrade/utils.py index c56b0e1..503cdaa 100644 --- a/komrade/utils.py +++ b/komrade/utils.py @@ -59,23 +59,9 @@ def hashish(binary_data): from base64 import b64encode,b64decode import ujson as json def package_for_transmission(data_json): - - # for k,v in data_json.items(): - # if type(v)==bytes: - # if not isBase64(v): v=b64encode(v) - # v=v.decode() - # elif type(v)==str: - # # if not isBase64(v): v=b64encode(v.encode()) - # pass - # elif type(v)==dict: - # v=package_for_transmission(v) - # data_json[k]=v - # print(type(data_json), data_json) - # data_json_s = json.dumps(data_json) - # data_json_b = data_json_s.encode() - print('package_for_transmission.data_json =',data_json) + # print('package_for_transmission.data_json =',data_json) data_json_bstr = json.dumps(data_json,reject_bytes=False) - print('package_for_transmission.data_json_b =',data_json_bstr) + # print('package_for_transmission.data_json_b =',data_json_bstr) return b64encode(data_json_bstr.encode()) @@ -100,28 +86,8 @@ def unpackage_from_transmission(data_json_b64): data_json_dejson = dejsonize(data_json) print('unpackage_from_transmission.data_json =',data_json_dejson) - stop return data_json - # print(type(data_json_b),'data_json_b1???',data_json_b) - # if type(data_json_b)==bytes and isBase64(data_json_b): data_json_b=b64decode(data_json_b) - # print(type(data_json_b),'data_json_b???',data_json_b) - # # print(type(data_json_b),) - # data_json_s = data_json_b.decode() - # print(type(data_json_s),'data_json_s???',data_json_s) - # data_json = json.loads(data_json_s) - # print(type(data_json),'data_json???',data_json) - # for k,v in data_json.items(): - # if type(v)==bytes: - # if isBase64(v):v=b64decode(v.decode()) - # data_json[k]=v - # elif type(v)==str: - # if isBase64(v): v=b64decode(v.encode()) - # data_json[k]=v - # elif type(v)==dict: - # data_json[k]=unpackage_from_transmission(v) - # return data_json - # Recursive dictionary merge