Fixed overall import strategy

force_bdss/api.py

@@ -21,6 +21,8 @@ from .mco.i_mco_factory import IMCOFactory  # noqa
 from .mco.parameters.base_mco_parameter_factory import BaseMCOParameterFactory  # noqa
 from .mco.parameters.base_mco_parameter import BaseMCOParameter  # noqa
 
+from .mco.events import *  # noqa
+
 from .notification_listeners.i_notification_listener_factory import INotificationListenerFactory  # noqa
 from .notification_listeners.base_notification_listener import BaseNotificationListener  # noqa
 from .notification_listeners.base_notification_listener_factory import BaseNotificationListenerFactory  # noqa

force_bdss/core_plugins/dummy/dummy_notification_listener/dummy_notification_listener.py

-from force_bdss.api import BaseNotificationListener
-from force_bdss.mco.events import (
-    MCOStartEvent, MCOFinishEvent, MCOProgressEvent)
+from force_bdss.api import (
+    BaseNotificationListener,
+    MCOStartEvent,
+    MCOFinishEvent,
+    MCOProgressEvent
+)
 
 
 class DummyNotificationListener(BaseNotificationListener):

force_bdss/core_plugins/dummy/dummy_notification_listener/dummy_notification_listener_factory.py

 from traits.api import String
 
-from force_bdss.ids import factory_id
-from force_bdss.notification_listeners.base_notification_listener_factory \
-    import \
-    BaseNotificationListenerFactory
+from force_bdss.api import (
+    factory_id,
+    BaseNotificationListenerFactory)
+
 from .dummy_notification_listener import DummyNotificationListener
 from .dummy_notification_listener_model import DummyNotificationListenerModel
 

force_bdss/core_plugins/dummy/dummy_notification_listener/dummy_notification_listener_model.py

-from force_bdss.notification_listeners.base_notification_listener_model \
-    import \
-    BaseNotificationListenerModel
+from force_bdss.api import BaseNotificationListenerModel
 
 
 class DummyNotificationListenerModel(BaseNotificationListenerModel):

force_bdss/core_plugins/dummy/dummy_plugin.py

 from force_bdss.api import BaseExtensionPlugin, plugin_id
-from force_bdss.core_plugins.dummy.dummy_notification_listener\
-    .dummy_notification_listener_factory import \
+from .dummy_notification_listener.dummy_notification_listener_factory import (
     DummyNotificationListenerFactory
-from force_bdss.core_plugins.dummy.ui_notification.ui_notification_factory \
-    import \
-    UINotificationFactory
+)
+from .ui_notification.ui_notification_factory import UINotificationFactory
 from .csv_extractor.csv_extractor_factory import CSVExtractorFactory
 from .kpi_adder.kpi_adder_factory import KPIAdderFactory
 from .dummy_dakota.dakota_factory import DummyDakotaFactory

force_bdss/core_plugins/dummy/ui_notification/ui_notification.py

@@ -2,14 +2,20 @@ import errno
 import logging
 from traits.api import Any, List
 
-from force_bdss.api import BaseNotificationListener
-import zmq
-
-from force_bdss.mco.events import MCOStartEvent, MCOFinishEvent, \
+from force_bdss.api import (
+    BaseNotificationListener,
+    MCOStartEvent,
+    MCOFinishEvent,
     MCOProgressEvent
+)
+
+import zmq
 
 
 class UINotification(BaseNotificationListener):
+    """
+    Notification engine for the UI. Uses zeromq for the traffic handling.
+    """
     #: The ZMQ context.
     _context = Any()
 
@@ -49,6 +55,15 @@ class UINotification(BaseNotificationListener):
         self._rep_socket = self._context.socket(zmq.REP)
         self._rep_socket.bind("tcp://*:12346")
 
+    def finalize(self, model):
+        self._pub_socket.close()
+        self._rep_socket.close()
+        self._context.term()
+
+        self._pub_socket = None
+        self._rep_socket = None
+        self._context = None
+
     def _format_event(self, event):
         if isinstance(event, MCOStartEvent):
             data = "MCO_START"
@@ -63,8 +78,3 @@ class UINotification(BaseNotificationListener):
 
         return ("EVENT\n{}".format(data)).encode("utf-8")
 
-    def finalize(self, model):
-        self._context.destroy()
-        self._pub_socket = None
-        self._rep_socket = None
-        self._context = None

force_bdss/core_plugins/dummy/ui_notification/ui_notification_factory.py

 from traits.api import String
 
-from force_bdss.ids import factory_id
-from force_bdss.notification_listeners.base_notification_listener_factory \
-    import \
-    BaseNotificationListenerFactory
+from force_bdss.api import factory_id, BaseNotificationListenerFactory
+
 from .ui_notification import UINotification
 from .ui_notification_model import UINotificationModel
 

force_bdss/core_plugins/dummy/ui_notification/ui_notification_model.py

-from force_bdss.notification_listeners.base_notification_listener_model \
-    import \
-    BaseNotificationListenerModel
+from force_bdss.api import BaseNotificationListenerModel
 
 
 class UINotificationModel(BaseNotificationListenerModel):