From 679aa1c6eb5c4f9eedd48da3ee51c4be63c00e6a Mon Sep 17 00:00:00 2001
From: Stefano Borini <sborini@enthought.com>
Date: Wed, 9 Aug 2017 15:21:52 +0100
Subject: [PATCH] Minor fixes for protocol
---
.../dummy/ui_notification/ui_notification.py | 12 ++++++------
utils/zmq_client.py | 4 ++--
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/force_bdss/core_plugins/dummy/ui_notification/ui_notification.py b/force_bdss/core_plugins/dummy/ui_notification/ui_notification.py
index 0553339..48cb2af 100644
--- a/force_bdss/core_plugins/dummy/ui_notification/ui_notification.py
+++ b/force_bdss/core_plugins/dummy/ui_notification/ui_notification.py
@@ -1,11 +1,11 @@
import errno
import logging
-from traits.api import Any, List, Instance
+from traits.api import Any, List
from force_bdss.api import BaseNotificationListener
import zmq
-from force_bdss.mco.events import BaseMCOEvent, MCOStartEvent, MCOFinishEvent, \
+from force_bdss.mco.events import MCOStartEvent, MCOFinishEvent, \
MCOProgressEvent
@@ -51,14 +51,14 @@ class UINotification(BaseNotificationListener):
def _format_event(self, event):
if isinstance(event, MCOStartEvent):
- data = "MCO_START\n"
+ data = "MCO_START"
elif isinstance(event, MCOFinishEvent):
- data = "MCO_FINISH\n"
+ data = "MCO_FINISH"
elif isinstance(event, MCOProgressEvent):
- data = "MCO_PROGRESS\n{}\n{}\n".format(
+ data = "MCO_PROGRESS\n{}\n{}".format(
" ".join([str(x) for x in event.input]),
" ".join([str(x) for x in event.output]))
else:
return None
- return ("EVENT {}".format(data)).encode("utf-8")
+ return ("EVENT\n{}".format(data)).encode("utf-8")
diff --git a/utils/zmq_client.py b/utils/zmq_client.py
index ec54404..9ca3d5e 100644
--- a/utils/zmq_client.py
+++ b/utils/zmq_client.py
@@ -11,10 +11,10 @@ send_socket.connect("tcp://localhost:12346")
send_socket.send("SYNC".encode("utf-8"))
data = send_socket.recv_multipart()
for d in data:
- split_data = d.split()
+ split_data = d.decode("utf-8").split("\n")
print("SYNCED ", split_data)
while True:
string = socket.recv()
- split_data = string.split()
+ split_data = string.decode('utf-8').split("\n")
print(split_data)
--
GitLab