Make it possible to use PluginLoader without store

[cascardo/ipsilon.git] / ipsilon / providers / openid / extensions / common.py

diff --git a/ipsilon/providers/openid/extensions/common.py b/ipsilon/providers/openid/extensions/common.py
old mode 100755 (executable)
new mode 100644 (file)
index 804f695..247584c
--- a/ipsilon/providers/openid/extensions/common.py
+++ b/ipsilon/providers/openid/extensions/common.py
@@ -1,6 +1,4 @@
-#!/usr/bin/python
-#
-# Copyright (C) 2014  Ipsilon project Contributors, for licensee see COPYING
+# Copyright (C) 2014 Ipsilon project Contributors, for license see COPYING

 
 from __future__ import absolute_import
 
 
 from __future__ import absolute_import
 


@@ -50,22 +48,20 @@ FACILITY = 'openid_extensions'
 class LoadExtensions(Log):
 
     def __init__(self):
 class LoadExtensions(Log):
 
     def __init__(self):

-        loader = PluginLoader(LoadExtensions, FACILITY, 'OpenidExtension')
-        self.plugins = loader.get_plugin_data()
+        self.plugins = PluginLoader(LoadExtensions,
+                                    FACILITY, 'OpenidExtension', False)
+        self.plugins.get_plugin_data()

 
 

-        available = self.plugins['available'].keys()
-        self._debug('Available Extensions: %s' % str(available))
+        available = self.plugins.available.keys()
+        self.debug('Available Extensions: %s' % str(available))

 
     def enable(self, enabled):
         for item in enabled:
 
     def enable(self, enabled):
         for item in enabled:

-            if item not in self.plugins['available']:
+            if item not in self.plugins.available:

                 self.debug('<%s> not available' % item)
                 continue
             self.debug('Enable OpenId extension: %s' % item)
                 self.debug('<%s> not available' % item)
                 continue
             self.debug('Enable OpenId extension: %s' % item)

-            self.plugins['available'][item].enable()
+            self.plugins.available[item].enable()

 
     def available(self):
 
     def available(self):

-        available = self.plugins['available']
-        if available is None:
-            available = dict()
-        return available
+        return self.plugins.available