mirror of
https://github.com/avatao-content/baseimage-tutorial-framework
synced 2024-11-22 23:21:32 +00:00
Make tfw.networking more structured, remove relative import hell
This commit is contained in:
parent
5e34835ed6
commit
b75709b3e5
@ -1,5 +1,5 @@
|
|||||||
from .networking.serialization import deserialize_all
|
from tfw.networking.serialization import deserialize_all
|
||||||
from .networking.server_connector import ServerConnector
|
from tfw.networking.event_handlers.server_connector import ServerConnector
|
||||||
|
|
||||||
|
|
||||||
class EventHandlerBase:
|
class EventHandlerBase:
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
|
|
||||||
from .networking.server_connector import ServerUplinkConnector
|
from tfw.networking.event_handlers.server_connector import ServerUplinkConnector
|
||||||
|
|
||||||
|
|
||||||
class MessageSender:
|
class MessageSender:
|
||||||
|
0
lib/tfw/networking/event_handlers/__init__.py
Normal file
0
lib/tfw/networking/event_handlers/__init__.py
Normal file
@ -3,9 +3,9 @@ from functools import partial
|
|||||||
from zmq.eventloop import ioloop
|
from zmq.eventloop import ioloop
|
||||||
from zmq.eventloop.zmqstream import ZMQStream
|
from zmq.eventloop.zmqstream import ZMQStream
|
||||||
|
|
||||||
from .serialization import serialize_all
|
from tfw.networking.serialization import serialize_all
|
||||||
from ..config import PUBLISHER_PORT, RECEIVER_PORT
|
from tfw.config import PUBLISHER_PORT, RECEIVER_PORT
|
||||||
from ..util import ZMQConnectorBase
|
from tfw.util import ZMQConnectorBase
|
||||||
|
|
||||||
|
|
||||||
ioloop.install()
|
ioloop.install()
|
0
lib/tfw/networking/server/__init__.py
Normal file
0
lib/tfw/networking/server/__init__.py
Normal file
@ -2,11 +2,11 @@ import zmq
|
|||||||
from zmq.eventloop import ioloop
|
from zmq.eventloop import ioloop
|
||||||
from zmq.eventloop.zmqstream import ZMQStream
|
from zmq.eventloop.zmqstream import ZMQStream
|
||||||
|
|
||||||
from .serialization import serialize_all
|
from tfw.networking.serialization import serialize_all
|
||||||
from ..config import PUBLISHER_PORT, RECEIVER_PORT
|
from tfw.config import PUBLISHER_PORT, RECEIVER_PORT
|
||||||
from ..config.logs import logging
|
from tfw.config.logs import logging
|
||||||
log = logging.getLogger(__name__)
|
log = logging.getLogger(__name__)
|
||||||
from ..util import ZMQConnectorBase
|
from tfw.util import ZMQConnectorBase
|
||||||
|
|
||||||
|
|
||||||
ioloop.install()
|
ioloop.install()
|
@ -1,10 +1,9 @@
|
|||||||
import json
|
import json
|
||||||
|
|
||||||
from tornado.websocket import WebSocketHandler
|
from tornado.websocket import WebSocketHandler
|
||||||
|
|
||||||
from .serialization import deserialize_all
|
from tfw.networking.serialization import deserialize_all
|
||||||
from .event_handler_connector import EventHandlerConnector
|
from tfw.networking.server.event_handler_connector import EventHandlerConnector
|
||||||
from ..config.logs import logging
|
from tfw.config.logs import logging
|
||||||
log = logging.getLogger(__name__)
|
log = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
|||||||
import json, xmlrpc.client, zmq
|
import xmlrpc.client, zmq
|
||||||
|
|
||||||
from .config.envvars import SUPERVISOR_HTTP_URI
|
from .config.envvars import SUPERVISOR_HTTP_URI
|
||||||
|
|
||||||
|
@ -7,7 +7,7 @@ from tornado.ioloop import IOLoop
|
|||||||
from tfw.config import WEB_PORT
|
from tfw.config import WEB_PORT
|
||||||
from tfw.config.logs import logging
|
from tfw.config.logs import logging
|
||||||
log = logging.getLogger(__name__)
|
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
|
from sql_injection_fsm import SQLInjectionFSM
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user