Implement change registration

[cascardo/ipsilon.git] / ipsilon / providers / personaidp.py

diff --git a/ipsilon/providers/personaidp.py b/ipsilon/providers/personaidp.py
old mode 100755 (executable)
new mode 100644 (file)
index 355726d..f0146db
--- a/ipsilon/providers/personaidp.py
+++ b/ipsilon/providers/personaidp.py
@@ -1,10 +1,8 @@
-#!/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
 

-from ipsilon.providers.common import ProviderBase
+from ipsilon.providers.common import ProviderBase, ProviderInstaller

 from ipsilon.util.plugin import PluginObject
 from ipsilon.util import config as pconfig
 from ipsilon.info.common import InfoMapping
 from ipsilon.util.plugin import PluginObject
 from ipsilon.util import config as pconfig
 from ipsilon.info.common import InfoMapping


@@ -68,7 +66,7 @@ Provides Persona authentication infrastructure. """
             self.key = M2Crypto.RSA.load_key(self.idp_key_file,
                                              lambda *args: None)
         except Exception, e:  # pylint: disable=broad-except
             self.key = M2Crypto.RSA.load_key(self.idp_key_file,
                                              lambda *args: None)
         except Exception, e:  # pylint: disable=broad-except

-            self._debug('Failed to init Persona provider: %r' % e)
+            self.debug('Failed to init Persona provider: %r' % e)

             return None
 
     def on_enable(self):
             return None
 
     def on_enable(self):


@@ -76,18 +74,18 @@ Provides Persona authentication infrastructure. """
         self.init_idp()
 
 
         self.init_idp()
 
 

-class Installer(object):
+class Installer(ProviderInstaller):

 
     def __init__(self, *pargs):
 
     def __init__(self, *pargs):

+        super(Installer, self).__init__()

         self.name = 'persona'
         self.name = 'persona'

-        self.ptype = 'provider'

         self.pargs = pargs
 
     def install_args(self, group):
         group.add_argument('--persona', choices=['yes', 'no'], default='yes',
                            help='Configure Persona Provider')
 
         self.pargs = pargs
 
     def install_args(self, group):
         group.add_argument('--persona', choices=['yes', 'no'], default='yes',
                            help='Configure Persona Provider')
 

-    def configure(self, opts):
+    def configure(self, opts, changes):

         if opts['persona'] != 'yes':
             return
 
         if opts['persona'] != 'yes':
             return