From 67a23166c6378d08e55a117258dabc43b020f05c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krist=C3=B3f=20T=C3=B3th?= Date: Fri, 13 Apr 2018 16:34:40 +0200 Subject: [PATCH] Introduce [de]serialize_tfw_msg() methods to abstract away enveloping --- lib/tfw/networking/__init__.py | 1 + lib/tfw/networking/serialization.py | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/lib/tfw/networking/__init__.py b/lib/tfw/networking/__init__.py index 161659b..b4abc25 100644 --- a/lib/tfw/networking/__init__.py +++ b/lib/tfw/networking/__init__.py @@ -2,6 +2,7 @@ # All Rights Reserved. See LICENSE file for details. from .serialization import decode_if_needed, encode_if_needed, serialize_all, deserialize_all +from .serialization import serialize_tfw_msg, deserialize_tfw_msg from .zmq_connector_base import ZMQConnectorBase from .controller_connector import ControllerConnector from .message_sender import MessageSender diff --git a/lib/tfw/networking/serialization.py b/lib/tfw/networking/serialization.py index d26257e..5c84a5c 100644 --- a/lib/tfw/networking/serialization.py +++ b/lib/tfw/networking/serialization.py @@ -4,6 +4,14 @@ import json +def serialize_tfw_msg(message): + return serialize_all(message['key'], message) + + +def deserialize_tfw_msg(*args): + return deserialize_all(*args)[1] + + def serialize_all(*args): return tuple(_serialize_single(arg) for arg in args)