merge stable
authorSylvain Thénault <sylvain.thenault@logilab.fr>
Fri, 14 Aug 2009 15:35:41 +0200
branchstable
changeset 2853 504b6f5e9452
parent 2850 92032ede5ae7 (diff)
parent 2852 858b33162e9d (current diff)
child 2854 5777ec682642
merge
--- a/_exceptions.py	Fri Aug 14 14:56:29 2009 +0200
+++ b/_exceptions.py	Fri Aug 14 15:35:41 2009 +0200
@@ -79,8 +79,6 @@
     msg = 'You are not allowed to perform this operation'
     msg1 = 'You are not allowed to perform %s operation on %s'
     var = None
-    #def __init__(self, *args):
-    #    self.args = args
 
     def __str__(self):
         try:
@@ -118,9 +116,6 @@
     this may be a programming/typo or a misconfiguration error
     """
 
-# class ViewNotFound(ObjectNotFound):
-#     """raised when an unregistered view is called"""
-
 class NoSelectableObject(RegistryException):
     """some views with the given vid have been found but no
     one is applyable to the result set
@@ -149,4 +144,3 @@
 
 # pylint: disable-msg=W0611
 from logilab.common.clcommands import BadCommandUsage
-
--- a/server/repository.py	Fri Aug 14 14:56:29 2009 +0200
+++ b/server/repository.py	Fri Aug 14 15:35:41 2009 +0200
@@ -228,7 +228,7 @@
             # register a task to cleanup expired session
             self.looping_task(self.config['session-time']/3.,
                               self.clean_sessions)
-        CW_EVENT_MANAGER.bind('after-registry-load', self.reset_hooks)
+        CW_EVENT_MANAGER.bind('after-registry-reload', self.reset_hooks)
 
     # internals ###############################################################
 
@@ -251,6 +251,7 @@
         self.reset_hooks()
 
     def reset_hooks(self):
+        print 'RESET HOOKS'
         self.hm.set_schema(self.schema)
         self.hm.register_system_hooks(self.config)
         # instance specific hooks
--- a/web/application.py	Fri Aug 14 14:56:29 2009 +0200
+++ b/web/application.py	Fri Aug 14 15:35:41 2009 +0200
@@ -41,10 +41,6 @@
         if self.session_time:
             assert self.cleanup_session_time < self.session_time
             assert self.cleanup_anon_session_time < self.session_time
-        self.set_authmanager()
-        CW_EVENT_MANAGER.bind('after-registry-reload', self.set_authmanager)
-
-    def set_authmanager(self):
         self.authmanager = self.vreg['components'].select('authmanager')
 
     def clean_sessions(self):