From 2fd4dab43f5a7d750d788625fa860a3e3fec3713 Mon Sep 17 00:00:00 2001 From: Konrad Date: Fri, 27 Sep 2019 20:23:55 +0200 Subject: [PATCH] changed json format to exclude redundant information Signed-off-by: Konrad --- HSMensaW_botA.py | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/HSMensaW_botA.py b/HSMensaW_botA.py index 22fa628..cb35e54 100644 --- a/HSMensaW_botA.py +++ b/HSMensaW_botA.py @@ -63,7 +63,7 @@ botID = -1 class EnumEncode(json.JSONEncoder): def default(self, obj): if type(obj) is Language: - return {"Language": str(obj.name)} + return str(obj.name) return json.JSONEncoder.default(self, obj) @@ -367,17 +367,13 @@ def get_now() -> str: return datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S") -def process_json(d: dict) -> Any: - if "Language" in d: - lang = d["Language"] - return getattr(Language, lang) - else: - if isinstance(d, dict): - try: - return {int(k): v for k, v in d.items()} - except ValueError: - return d - return d +def process_json(d): + if isinstance(d, dict): + try: + return {int(k): getattr(Language, v) for k, v in d.items()} + except (ValueError, TypeError): + return d + return d sys.stdout = open("out.log", "a")