X-Git-Url: http://git.cascardo.info/?p=cascardo%2Fipsilon.git;a=blobdiff_plain;f=ipsilon%2Fproviders%2Fpersonaidp.py;h=2a28ba9fcee7446f5845ee493c5c2ac53cc625b7;hp=355726d82f49704328b8027bf0cd3ae998ade7c3;hb=HEAD;hpb=943158d19f879eb6ad515edeb59017671e4252c5

diff --git a/ipsilon/providers/personaidp.py b/ipsilon/providers/personaidp.py
old mode 100755
new mode 100644
index 355726d..2a28ba9
--- 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 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
@@ -56,7 +54,6 @@ Provides Persona authentication infrastructure. """
         return self.get_config_value('allowed domains')
 
     def get_tree(self, site):
-        self.init_idp()
         self.page = Persona(site, self)
         # self.admin = AdminPage(site, self)
 
@@ -68,7 +65,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._debug('Failed to init Persona provider: %r' % e)
+            self.debug('Failed to init Persona provider: %r' % e)
             return None
 
     def on_enable(self):
@@ -76,18 +73,18 @@ Provides Persona authentication infrastructure. """
         self.init_idp()
 
 
-class Installer(object):
+class Installer(ProviderInstaller):
 
     def __init__(self, *pargs):
+        super(Installer, self).__init__()
         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')
 
-    def configure(self, opts):
+    def configure(self, opts, changes):
         if opts['persona'] != 'yes':
             return