From b75709b3e582684e33b0016f6296331b92a1038e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krist=C3=B3f=20T=C3=B3th?= Date: Tue, 6 Feb 2018 14:19:41 +0100 Subject: [PATCH] Make tfw.networking more structured, remove relative import hell --- lib/tfw/event_handler_base.py | 4 ++-- lib/tfw/message_sender.py | 2 +- lib/tfw/networking/event_handlers/__init__.py | 0 .../networking/{ => event_handlers}/server_connector.py | 6 +++--- lib/tfw/networking/server/__init__.py | 0 .../networking/{ => server}/event_handler_connector.py | 8 ++++---- lib/tfw/networking/{ => server}/zmq_websocket_handler.py | 7 +++---- lib/tfw/util.py | 2 +- src/app/app.py | 2 +- 9 files changed, 15 insertions(+), 16 deletions(-) create mode 100644 lib/tfw/networking/event_handlers/__init__.py rename lib/tfw/networking/{ => event_handlers}/server_connector.py (90%) create mode 100644 lib/tfw/networking/server/__init__.py rename lib/tfw/networking/{ => server}/event_handler_connector.py (89%) rename lib/tfw/networking/{ => server}/zmq_websocket_handler.py (92%) diff --git a/lib/tfw/event_handler_base.py b/lib/tfw/event_handler_base.py index 1ab3192..4dfdb84 100644 --- a/lib/tfw/event_handler_base.py +++ b/lib/tfw/event_handler_base.py @@ -1,5 +1,5 @@ -from .networking.serialization import deserialize_all -from .networking.server_connector import ServerConnector +from tfw.networking.serialization import deserialize_all +from tfw.networking.event_handlers.server_connector import ServerConnector class EventHandlerBase: diff --git a/lib/tfw/message_sender.py b/lib/tfw/message_sender.py index d5cb528..df21265 100644 --- a/lib/tfw/message_sender.py +++ b/lib/tfw/message_sender.py @@ -1,6 +1,6 @@ from datetime import datetime -from .networking.server_connector import ServerUplinkConnector +from tfw.networking.event_handlers.server_connector import ServerUplinkConnector class MessageSender: diff --git a/lib/tfw/networking/event_handlers/__init__.py b/lib/tfw/networking/event_handlers/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/lib/tfw/networking/server_connector.py b/lib/tfw/networking/event_handlers/server_connector.py similarity index 90% rename from lib/tfw/networking/server_connector.py rename to lib/tfw/networking/event_handlers/server_connector.py index a1f03ee..ee4c50e 100644 --- a/lib/tfw/networking/server_connector.py +++ b/lib/tfw/networking/event_handlers/server_connector.py @@ -3,9 +3,9 @@ from functools import partial from zmq.eventloop import ioloop from zmq.eventloop.zmqstream import ZMQStream -from .serialization import serialize_all -from ..config import PUBLISHER_PORT, RECEIVER_PORT -from ..util import ZMQConnectorBase +from tfw.networking.serialization import serialize_all +from tfw.config import PUBLISHER_PORT, RECEIVER_PORT +from tfw.util import ZMQConnectorBase ioloop.install() diff --git a/lib/tfw/networking/server/__init__.py b/lib/tfw/networking/server/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/lib/tfw/networking/event_handler_connector.py b/lib/tfw/networking/server/event_handler_connector.py similarity index 89% rename from lib/tfw/networking/event_handler_connector.py rename to lib/tfw/networking/server/event_handler_connector.py index c324961..276ad9a 100644 --- a/lib/tfw/networking/event_handler_connector.py +++ b/lib/tfw/networking/server/event_handler_connector.py @@ -2,11 +2,11 @@ import zmq from zmq.eventloop import ioloop from zmq.eventloop.zmqstream import ZMQStream -from .serialization import serialize_all -from ..config import PUBLISHER_PORT, RECEIVER_PORT -from ..config.logs import logging +from tfw.networking.serialization import serialize_all +from tfw.config import PUBLISHER_PORT, RECEIVER_PORT +from tfw.config.logs import logging log = logging.getLogger(__name__) -from ..util import ZMQConnectorBase +from tfw.util import ZMQConnectorBase ioloop.install() diff --git a/lib/tfw/networking/zmq_websocket_handler.py b/lib/tfw/networking/server/zmq_websocket_handler.py similarity index 92% rename from lib/tfw/networking/zmq_websocket_handler.py rename to lib/tfw/networking/server/zmq_websocket_handler.py index 8017220..e29304d 100644 --- a/lib/tfw/networking/zmq_websocket_handler.py +++ b/lib/tfw/networking/server/zmq_websocket_handler.py @@ -1,10 +1,9 @@ import json - from tornado.websocket import WebSocketHandler -from .serialization import deserialize_all -from .event_handler_connector import EventHandlerConnector -from ..config.logs import logging +from tfw.networking.serialization import deserialize_all +from tfw.networking.server.event_handler_connector import EventHandlerConnector +from tfw.config.logs import logging log = logging.getLogger(__name__) diff --git a/lib/tfw/util.py b/lib/tfw/util.py index c2b1446..4785ed4 100644 --- a/lib/tfw/util.py +++ b/lib/tfw/util.py @@ -1,4 +1,4 @@ -import json, xmlrpc.client, zmq +import xmlrpc.client, zmq from .config.envvars import SUPERVISOR_HTTP_URI diff --git a/src/app/app.py b/src/app/app.py index 1fc3c44..2ab1ea7 100644 --- a/src/app/app.py +++ b/src/app/app.py @@ -7,7 +7,7 @@ from tornado.ioloop import IOLoop from tfw.config import WEB_PORT from tfw.config.logs import logging log = logging.getLogger(__name__) -from tfw.networking.zmq_websocket_handler import FSMManagingSocketHandler +from tfw.networking.server.zmq_websocket_handler import FSMManagingSocketHandler from sql_injection_fsm import SQLInjectionFSM