From 1e2ea0ed17119ead9a49228be1ee653a9634f98b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krist=C3=B3f=20T=C3=B3th?= Date: Sun, 25 Mar 2018 15:43:59 +0200 Subject: [PATCH] Standardize imports: standard newline package newline tfw --- lib/tfw/components/directory_monitor.py | 3 ++- lib/tfw/components/history_monitor.py | 3 ++- lib/tfw/components/mixins/supervisor_mixin.py | 2 +- lib/tfw/components/source_code_event_handler.py | 1 - lib/tfw/fsm_base.py | 1 + lib/tfw/networking/event_handlers/server_connector.py | 3 ++- lib/tfw/networking/server/event_handler_connector.py | 2 +- lib/tfw/networking/server/tfw_server.py | 3 ++- lib/tfw/networking/server/zmq_websocket_handler.py | 1 + 9 files changed, 12 insertions(+), 7 deletions(-) diff --git a/lib/tfw/components/directory_monitor.py b/lib/tfw/components/directory_monitor.py index 2ccffeb..645db89 100644 --- a/lib/tfw/components/directory_monitor.py +++ b/lib/tfw/components/directory_monitor.py @@ -1,6 +1,7 @@ +from functools import wraps + from watchdog.observers import Observer from watchdog.events import FileSystemEventHandler as FileSystemWatchdogEventHandler -from functools import wraps from tfw.networking.event_handlers.server_connector import ServerUplinkConnector from tfw.components.decorators import RateLimiter diff --git a/lib/tfw/components/history_monitor.py b/lib/tfw/components/history_monitor.py index 9d8abf6..2f69586 100644 --- a/lib/tfw/components/history_monitor.py +++ b/lib/tfw/components/history_monitor.py @@ -1,6 +1,7 @@ +from os.path import dirname + from watchdog.observers import Observer from watchdog.events import PatternMatchingEventHandler -from os.path import dirname from tfw.components.mixins.callback_mixin import CallbackMixin diff --git a/lib/tfw/components/mixins/supervisor_mixin.py b/lib/tfw/components/mixins/supervisor_mixin.py index e00e728..1ed66b3 100644 --- a/lib/tfw/components/mixins/supervisor_mixin.py +++ b/lib/tfw/components/mixins/supervisor_mixin.py @@ -1,6 +1,6 @@ import xmlrpc.client -from contextlib import suppress from xmlrpc.client import Fault as SupervisorFault +from contextlib import suppress from os import remove from tfw.config import tfwenv diff --git a/lib/tfw/components/source_code_event_handler.py b/lib/tfw/components/source_code_event_handler.py index 8986bf2..6e3bec0 100644 --- a/lib/tfw/components/source_code_event_handler.py +++ b/lib/tfw/components/source_code_event_handler.py @@ -5,7 +5,6 @@ from collections import Iterable from tfw.event_handler_base import TriggerlessEventHandler from tfw.components.directory_monitor import DirectoryMonitor - from tfw.config.logs import logging log = logging.getLogger(__name__) diff --git a/lib/tfw/fsm_base.py b/lib/tfw/fsm_base.py index b46a563..4160512 100644 --- a/lib/tfw/fsm_base.py +++ b/lib/tfw/fsm_base.py @@ -1,4 +1,5 @@ from typing import List + from transitions import Machine from tfw.components.mixins.callback_mixin import CallbackMixin diff --git a/lib/tfw/networking/event_handlers/server_connector.py b/lib/tfw/networking/event_handlers/server_connector.py index ab92e41..223f787 100644 --- a/lib/tfw/networking/event_handlers/server_connector.py +++ b/lib/tfw/networking/event_handlers/server_connector.py @@ -1,5 +1,6 @@ -import zmq from functools import partial + +import zmq from zmq.eventloop.zmqstream import ZMQStream from tfw.networking.serialization import serialize_all diff --git a/lib/tfw/networking/server/event_handler_connector.py b/lib/tfw/networking/server/event_handler_connector.py index 1e7ca69..b01d7c3 100644 --- a/lib/tfw/networking/server/event_handler_connector.py +++ b/lib/tfw/networking/server/event_handler_connector.py @@ -1,11 +1,11 @@ import zmq from zmq.eventloop.zmqstream import ZMQStream +from tfw.networking.zmq_connector_base import ZMQConnectorBase from tfw.networking.serialization import serialize_all from tfw.config import tfwenv from tfw.config.logs import logging log = logging.getLogger(__name__) -from tfw.networking.zmq_connector_base import ZMQConnectorBase class EventHandlerDownlinkConnector(ZMQConnectorBase): diff --git a/lib/tfw/networking/server/tfw_server.py b/lib/tfw/networking/server/tfw_server.py index 3596863..c0ad6eb 100644 --- a/lib/tfw/networking/server/tfw_server.py +++ b/lib/tfw/networking/server/tfw_server.py @@ -1,6 +1,7 @@ -from tornado.web import Application from collections import defaultdict +from tornado.web import Application + from tfw.networking.server.zmq_websocket_handler import ZMQWebSocketProxy from tfw.networking.event_handlers.server_connector import ServerUplinkConnector from tfw.message_sender import MessageSender diff --git a/lib/tfw/networking/server/zmq_websocket_handler.py b/lib/tfw/networking/server/zmq_websocket_handler.py index 017040e..100c515 100644 --- a/lib/tfw/networking/server/zmq_websocket_handler.py +++ b/lib/tfw/networking/server/zmq_websocket_handler.py @@ -1,4 +1,5 @@ import json + from tornado.websocket import WebSocketHandler from tfw.networking.serialization import deserialize_all