Changeset 1171:9fdc5c7f22e7

Timestamp:

05/19/08 22:59:57 (22 months ago)

Author:

Ronny Pfannschmidt <Ronny.Pfannschmidt@…>

Branch:

default

Message:

got rid of the mess pida.core.plugins

Files:

• pida/core/plugins.py (deleted)
• pida/core/service.py (modified) (1 diff)
• pida/core/servicemanager.py (modified) (5 diffs)
• tests/core/test_plugins.py (deleted)

pida/core/service.py

@@ -4 +4 @@
 
 # PIDA Imports
-from pida.core.interfaces import IOptions, IEvents, ICommands, IActions, IFeatures
-from pida.core.plugins import Registry
 from pida.core.events import EventsConfig
 from pida.core.options import OptionsConfig

pida/core/servicemanager.py

@@ -1 +1 @@
 import os, imp, sys
 
-from pida.core.interfaces import IService, IEditor, IPlugin
-from pida.core.plugins import Registry
 from pida.core.service import Service
 
@@ -111 +109 @@
         self._boss = boss
         self._loader = ServiceLoader(self._boss)
-        self._reg = Registry()
-        self._plugin_objects = {}
+        self._reg = {}
 
     def get_service(self, name):
-        return self._reg.get_singleton(name)
+        return self._reg[name]
 
     def get_services(self):
         return sorted(
-                self._reg.get_features(IService),
+                self._reg.values(),
                 key=Service.sort_key)
 
     def get_plugins(self):
-        return sorted(
-                self._reg.get_features(IPlugin),
-                key=Service.sort_key)
+        services = self.get_services()
+        return [s for s in services if not s.__module__.startswith('pida.services')]
 
     def get_services_not_plugins(self):
         services = self.get_services()
-        plugins = self.get_plugins()
-        return [s for s in services if s not in plugins]
+        return [s for s in services if s.__module__.startswith('pida.services')]
 
     def activate_services(self):
@@ -161 +156 @@
                 plugin.stop_components()
                 plugin.stop()
-                self._reg.unregister(self._plugin_objects[plugin_name])
+                del self._reg[plugin_name]
                 return plugin
             else:
@@ -174 +169 @@
 
     def _register_service(self, service):
-        self._reg.register_plugin(
-            instance=service,
-            singletons=(
-                service.get_name(),
-            ),
-            features=(
-                IService,
-            )
-        )
-
-    def _register_plugin(self, plugin):
-        plugin_object = self._reg.register_plugin(
-            instance=plugin,
-            singletons=(
-                plugin.get_name(),
-            ),
-            features=(
-                IService,
-                IPlugin,
-            )
-        )
-        self._plugin_objects[plugin.get_name()] = plugin_object
+        self._reg[service.get_name()] = service
+
+    def _register_plugin(self, service):
+        self._reg[service.get_name()] = service
 
     def _create_services(self):
@@ -239 +216 @@
 
     def register_editor(self, service):
-        self._reg.register_plugin(
-            instance=service,
-            singletons=(
-                service.get_name(),
-                IEditor,
-            ),
-            features=(
-                IService,
-            )
-        )
+        self._reg[service.get_name()] = service
 
     def stop(self):