swap the usage of plugins and plugin_modules

grigorescu · Jul 22, 2011 · 97f7295 · 97f7295
1 parent 470cdfe
commit 97f7295
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/ninfo/__init__.py b/ninfo/__init__.py
@@ -30,10 +30,10 @@ def get_info_json(self, arg):
 
 class Ninfo:
     def __init__(self, config_file=None):
-        self.plugin_modules = {}
-        for ep in iter_entry_points(group='ninfo.plugin'):
-            self.plugin_modules[ep.name] = ep
         self.plugins = {}
+        for ep in iter_entry_points(group='ninfo.plugin'):
+            self.plugins[ep.name] = ep
+        self.plugin_modules = {}
         self.plugin_instances = {}
 
         self.read_config(config_file)
@@ -55,11 +55,11 @@ def read_config(self, config_file):
         self.config = dict((s, dict(cp.items(s))) for s in cp.sections())
 
     def get_plugin(self, plugin):
-        if plugin in self.plugins:
-            return self.plugins[plugin]
+        if plugin in self.plugin_modules:
+            return self.plugin_modules[plugin]
 
-        p = self.plugin_modules[plugin].load().plugin_class
-        self.plugins[plugin] = p
+        p = self.plugins[plugin].load().plugin_class
+        self.plugin_modules[plugin] = p
         return p
 
     def get_inst(self, plugin):

diff --git a/tests/test_plugin_loading.py b/tests/test_plugin_loading.py
@@ -2,14 +2,14 @@
 def test_loading():
     n = ninfo.Ninfo()
 
-    assert n.plugin_modules != {}
+    assert n.plugins != {}
 
-    assert 'whois' not in n.plugins
+    assert 'whois' not in n.plugin_modules
     assert 'whois' not in n.plugin_instances
 
     n.get_plugin('whois')
 
-    assert 'whois' in n.plugins
+    assert 'whois' in n.plugin_modules
 
     n.get_inst('whois')
     assert 'whois' in n.plugin_instances