projects
/
cascardo
/
ipsilon.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Refactor plugin configuration
[cascardo/ipsilon.git]
/
ipsilon
/
login
/
common.py
diff --git
a/ipsilon/login/common.py
b/ipsilon/login/common.py
index
028b754
..
ad09ce1
100755
(executable)
--- a/
ipsilon/login/common.py
+++ b/
ipsilon/login/common.py
@@
-19,8
+19,8
@@
from ipsilon.util.page import Page
from ipsilon.util.user import UserSession
from ipsilon.util.page import Page
from ipsilon.util.user import UserSession
-from ipsilon.util.plugin import Plugin
Loader, PluginObject
-from ipsilon.util.plugin import Plugin
Installer
+from ipsilon.util.plugin import Plugin
Installer, PluginLoader
+from ipsilon.util.plugin import Plugin
Object, PluginConfig
from ipsilon.info.common import Info
from ipsilon.util.cookies import SecureCookie
import cherrypy
from ipsilon.info.common import Info
from ipsilon.util.cookies import SecureCookie
import cherrypy
@@
-29,10
+29,11
@@
import cherrypy
USERNAME_COOKIE = 'ipsilon_default_username'
USERNAME_COOKIE = 'ipsilon_default_username'
-class LoginManagerBase(PluginObject):
+class LoginManagerBase(Plugin
Config, Plugin
Object):
def __init__(self):
def __init__(self):
- super(LoginManagerBase, self).__init__()
+ PluginConfig.__init__(self)
+ PluginObject.__init__(self)
self._site = None
self.path = '/'
self.next_login = None
self._site = None
self.path = '/'
self.next_login = None
@@
-126,7
+127,7
@@
class LoginManagerBase(PluginObject):
# configure self
if self.name in plugins['config']:
# configure self
if self.name in plugins['config']:
- self.
se
t_config(plugins['config'][self.name])
+ self.
impor
t_config(plugins['config'][self.name])
# and add self to the root
root = plugins['root']
# and add self to the root
root = plugins['root']