mrtoth/baseimage-tutorial-framework
1
0
Fork 0
mirror of https://github.com/avatao-content/baseimage-tutorial-framework synced 2024-11-05 16:21:20 +00:00
Code Issues Releases Wiki Activity

Add message_bytes() function to serialization module

Browse Source
This commit is contained in:
Kristóf Tóth 2018-07-15 17:26:00 +02:00
parent 646a671ff3
commit 16d98c75ca
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/tfw/networking/__init__.py
View File

@ -1,9 +1,9 @@
# Copyright (C) 2018 Avatao.com Innovative Learning Kft. # Copyright (C) 2018 Avatao.com Innovative Learning Kft.
# All Rights Reserved. See LICENSE file for details. # All Rights Reserved. See LICENSE file for details.
from .serialization import serialize_tfw_msg, deserialize_tfw_msg, with_deserialize_tfw_msg from .serialization import serialize_tfw_msg, deserialize_tfw_msg
from .serialization import with_deserialize_tfw_msg, message_bytes
from .zmq_connector_base import ZMQConnectorBase from .zmq_connector_base import ZMQConnectorBase
# from .controller_connector import ControllerConnector # TODO: readd once controller stuff is resolved
from .message_sender import MessageSender from .message_sender import MessageSender
from .event_handlers.server_connector import ServerUplinkConnector as TFWServerConnector from .event_handlers.server_connector import ServerUplinkConnector as TFWServerConnector
from .server.tfw_server import TFWServer from .server.tfw_server import TFWServer

6
lib/tfw/networking/serialization.py
View File

@ -67,10 +67,14 @@ def _serialize_single(data):
(serialize input if it is JSON) (serialize input if it is JSON)
""" """
if not isinstance(data, str): if not isinstance(data, str):
data = json.dumps(data) data = message_bytes(data)
return _encode_if_needed(data) return _encode_if_needed(data)
def message_bytes(message):
return json.dumps(message, sort_keys=True).encode()
def _deserialize_single(data): def _deserialize_single(data):
""" """
Try parsing input as JSON, return it as Try parsing input as JSON, return it as