From 7c8663d53912938eb9c48574d409960a0df76f0f Mon Sep 17 00:00:00 2001 From: Wolfgang Hottgenroth Date: Mon, 8 Jul 2019 14:51:36 +0100 Subject: [PATCH] fixes --- src/RegisterDatapoint.py | 2 +- src/master.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/RegisterDatapoint.py b/src/RegisterDatapoint.py index 52cd333..81a4667 100644 --- a/src/RegisterDatapoint.py +++ b/src/RegisterDatapoint.py @@ -1,7 +1,7 @@ import datetime from pymodbus.pdu import ExceptionResponse from pymodbus.exceptions import ModbusIOException -from src import MqttProcessor +import MqttProcessor class DatapointException(Exception): pass diff --git a/src/master.py b/src/master.py index 9a31a45..46c82d4 100644 --- a/src/master.py +++ b/src/master.py @@ -2,7 +2,7 @@ import CmdServer import MqttProcessor import CommunicationProcessor import MyPriorityQueue -import queue +from queue import Queue import NotificationForwarder import Config import ScanRateConsideringQueueFeeder @@ -14,7 +14,7 @@ import pickle if __name__ == "__main__": queue = MyPriorityQueue.MyPriorityQueue() - pubQueue = queue.queue() + pubQueue = Queue() nf = NotificationForwarder.NotificationForwarder() config = Config.Config() @@ -35,4 +35,4 @@ if __name__ == "__main__": qf.start() cs = CmdServer.CmdServer(config, nf, datapoints) - cs.start() \ No newline at end of file + cs.start()