From 72cbd488ff5e99f616ba05b8f5106177d6f9c14b Mon Sep 17 00:00:00 2001 From: "artem30801@gmail.com" Date: Thu, 28 Mar 2019 19:35:56 +0300 Subject: [PATCH] Msg format changed to pure json --- Drone/client.py | 6 ++---- Server/server.py | 8 +++----- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/Drone/client.py b/Drone/client.py index ff3f9a3..4095074 100644 --- a/Drone/client.py +++ b/Drone/client.py @@ -107,7 +107,7 @@ def recive_message(): def form_message(str_command, dict_arguments): - msg_dict = {str_command: str(dict_arguments).replace(",", '').replace("'", '')[1:-1]} + msg_dict = {str_command: dict_arguments} msg = json.dumps(msg_dict) return msg @@ -118,11 +118,9 @@ def parse_message(msg): except ValueError: print("Json string not in correct format") return None, None - str_command = list(j_message.keys())[0] + dict_arguments = list(j_message.values())[0] - arguments = list(j_message.values())[0].replace(":", '').split() - dict_arguments = dict(zip(arguments[::2], arguments[1::2])) return str_command, dict_arguments diff --git a/Server/server.py b/Server/server.py index 2c8b318..cc1a2e3 100644 --- a/Server/server.py +++ b/Server/server.py @@ -307,7 +307,7 @@ class Client: def form_message(command: str, dict_arguments: dict = None): if dict_arguments is None: dict_arguments = {} - msg_dict = {command: str(dict_arguments).replace(",", '').replace("'", '')[1:-1]} + msg_dict = {command: dict_arguments} msg = json.dumps(msg_dict) return msg @@ -315,14 +315,12 @@ class Client: def parse_message(msg): try: j_message = json.loads(msg) - except json.decoder.JSONDecodeError: + except ValueError: print("Json string not in correct format") return None, None - str_command = list(j_message.keys())[0] + dict_arguments = list(j_message.values())[0] - arguments = list(j_message.values())[0].replace(":", '').split() - dict_arguments = collections.OrderedDict(zip(arguments[::2], arguments[1::2])) return str_command, dict_arguments @requires_connect