Move mixins and decorators to tfw module from tfw.components

lib/tfw/components/directory_monitor.py

@@ -6,8 +6,8 @@ from functools import wraps
 from watchdog.events import FileSystemEventHandler as FileSystemWatchdogEventHandler
 
 from tfw.networking.event_handlers import ServerUplinkConnector
-from tfw.components.decorators import RateLimiter
+from tfw.decorators import RateLimiter
-from tfw.components.mixins import ObserverMixin
+from tfw.mixins import ObserverMixin
 
 from tfw.config.logs import logging
 

lib/tfw/components/history_monitor.py

@@ -8,8 +8,8 @@ from abc import ABC, abstractmethod
 
 from watchdog.events import PatternMatchingEventHandler
 
-from tfw.components.mixins import CallbackMixin, ObserverMixin
+from tfw.mixins import CallbackMixin, ObserverMixin
-from tfw.components.decorators import RateLimiter
+from tfw.decorators import RateLimiter
 
 
 class CallbackEventHandler(PatternMatchingEventHandler, ABC):

lib/tfw/components/process_managing_event_handler.py

@@ -4,7 +4,7 @@
 from xmlrpc.client import Fault as SupervisorFault
 
 from tfw import TriggerlessEventHandler
-from tfw.components.mixins import SupervisorMixin
+from tfw.mixins import SupervisorMixin
 from tfw.config.logs import logging
 from .directory_monitor import with_monitor_paused
 

lib/tfw/fsm_base.py

@@ -5,7 +5,7 @@ from typing import List
 
 from transitions import Machine
 
-from tfw.components.mixins import CallbackMixin
+from tfw.mixins import CallbackMixin
 
 
 class FSMBase(CallbackMixin):