diff --git a/komrade/backend/operators.py b/komrade/backend/operators.py index 7b5f6aa..b79e3d7 100644 --- a/komrade/backend/operators.py +++ b/komrade/backend/operators.py @@ -135,9 +135,9 @@ class Operator(Keymaker): from_phone_keychain = from_phone.keychain() self.log('from_phone',type(from_phone),'to_phone',type(to_phone)) self.log('from_phone_keychain',from_phone_keychain) - # self.log('to_phone_keychain',to_phone_keychain) + self.log('to_phone_keychain',to_phone_keychain) - eeeee + from_phone_pubkey_encr=from_phone_keychain.get('pubkey_encr') from_phone_privkey=from_phone_keychain.get('privkey') diff --git a/komrade/utils.py b/komrade/utils.py index 503cdaa..c13d01c 100644 --- a/komrade/utils.py +++ b/komrade/utils.py @@ -58,11 +58,12 @@ def hashish(binary_data): from base64 import b64encode,b64decode import ujson as json +import pickle def package_for_transmission(data_json): # print('package_for_transmission.data_json =',data_json) - data_json_bstr = json.dumps(data_json,reject_bytes=False) + data_json_b = pickle.dumps(data_json) # print('package_for_transmission.data_json_b =',data_json_bstr) - return b64encode(data_json_bstr.encode()) + return b64encode(data_json_b) def dejsonize(dict): @@ -76,15 +77,15 @@ def dejsonize(dict): return dict def unpackage_from_transmission(data_json_b64): - print('unpackage_from_transmission.data_json_b64 =',data_json_b64) - data_json_bstr = b64decode(data_json_b64).decode() - print('unpackage_from_transmission.data_json_bstr =',data_json_bstr) + # print('unpackage_from_transmission.data_json_b64 =',data_json_b64) + data_json_b = b64decode(data_json_b64) + print('unpackage_from_transmission.data_json_bstr =',data_json_b) - data_json = json.loads(data_json_bstr) - print('unpackage_from_transmission.data_json =',data_json) + data_json = pickle.loads(data_json_b) + # print('unpackage_from_transmission.data_json =',data_json) - data_json_dejson = dejsonize(data_json) - print('unpackage_from_transmission.data_json =',data_json_dejson) + # data_json_dejson = dejsonize(data_json) + # print('unpackage_from_transmission.data_json =',data_json_dejson) return data_json