diff --git a/lib/tfw/networking/controller_connector.py b/lib/tfw/networking/controller_connector.py index 64f83b2..dcafa70 100644 --- a/lib/tfw/networking/controller_connector.py +++ b/lib/tfw/networking/controller_connector.py @@ -3,7 +3,7 @@ from zmq.eventloop import ioloop from zmq.eventloop.zmqstream import ZMQStream from tfw.config import tfwenv -from tfw.util import ZMQConnectorBase +from tfw.networking.zmq_connector_base import ZMQConnectorBase ioloop.install() diff --git a/lib/tfw/networking/event_handlers/server_connector.py b/lib/tfw/networking/event_handlers/server_connector.py index 700468a..d15d467 100644 --- a/lib/tfw/networking/event_handlers/server_connector.py +++ b/lib/tfw/networking/event_handlers/server_connector.py @@ -4,7 +4,7 @@ from zmq.eventloop.zmqstream import ZMQStream from tfw.networking.serialization import serialize_all from tfw.config import tfwenv -from tfw.util import ZMQConnectorBase +from tfw.networking.zmq_connector_base import ZMQConnectorBase class ServerDownlinkConnector(ZMQConnectorBase): diff --git a/lib/tfw/networking/server/event_handler_connector.py b/lib/tfw/networking/server/event_handler_connector.py index 310ad28..a5149f3 100644 --- a/lib/tfw/networking/server/event_handler_connector.py +++ b/lib/tfw/networking/server/event_handler_connector.py @@ -5,7 +5,7 @@ from tfw.networking.serialization import serialize_all from tfw.config import tfwenv from tfw.config.logs import logging log = logging.getLogger(__name__) -from tfw.util import ZMQConnectorBase +from tfw.networking.zmq_connector_base import ZMQConnectorBase class EventHandlerDownlinkConnector(ZMQConnectorBase): diff --git a/lib/tfw/networking/solvable_connector.py b/lib/tfw/networking/solvable_connector.py index 7a77a57..a207a21 100644 --- a/lib/tfw/networking/solvable_connector.py +++ b/lib/tfw/networking/solvable_connector.py @@ -2,7 +2,7 @@ import zmq from zmq.eventloop import ioloop from tfw.config import tfwenv -from tfw.util import ZMQConnectorBase +from tfw.networking.zmq_connector_base import ZMQConnectorBase from tfw.networking.serialization import serialize_all, deserialize_all ioloop.install() diff --git a/lib/tfw/networking/zmq_connector_base.py b/lib/tfw/networking/zmq_connector_base.py new file mode 100644 index 0000000..c4c838a --- /dev/null +++ b/lib/tfw/networking/zmq_connector_base.py @@ -0,0 +1,6 @@ +import zmq + + +class ZMQConnectorBase: + def __init__(self, zmq_context=None): + self._zmq_context = zmq_context or zmq.Context.instance() diff --git a/lib/tfw/util.py b/lib/tfw/util.py index 7ee99cc..4c53d4e 100644 --- a/lib/tfw/util.py +++ b/lib/tfw/util.py @@ -1,4 +1,4 @@ -import xmlrpc.client, zmq +import xmlrpc.client from contextlib import suppress from xmlrpc.client import Fault as SupervisorFault from time import time, sleep @@ -30,11 +30,6 @@ class SupervisorMixin: self.start_process() -class ZMQConnectorBase: - def __init__(self, zmq_context=None): - self._zmq_context = zmq_context or zmq.Context.instance() - - class RateLimiter: def __init__(self, rate_per_second): self.min_interval = 1 / float(rate_per_second)