Commit 3415c64a authored by Romain Courteaud's avatar Romain Courteaud

Revert revision 19203.

Do not use except without Exception name.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@19223 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent b25003dc
...@@ -26,7 +26,6 @@ from Products.PluggableAuthService.interfaces.plugins import IGroupsPlugin ...@@ -26,7 +26,6 @@ from Products.PluggableAuthService.interfaces.plugins import IGroupsPlugin
from Products.ERP5Type.Cache import CachingMethod from Products.ERP5Type.Cache import CachingMethod
from Products.PluggableAuthService.PropertiedUser import PropertiedUser from Products.PluggableAuthService.PropertiedUser import PropertiedUser
from ZODB.POSException import ConflictError from ZODB.POSException import ConflictError
from Shared.DC.ZRDB.DA import DatabaseError
import sys import sys
...@@ -184,23 +183,10 @@ class ERP5GroupManager(BasePlugin): ...@@ -184,23 +183,10 @@ class ERP5GroupManager(BasePlugin):
id='ERP5GroupManager_getGroupsForPrincipal', id='ERP5GroupManager_getGroupsForPrincipal',
cache_factory='erp5_content_short') cache_factory='erp5_content_short')
try:
return _getGroupsForPrincipal( return _getGroupsForPrincipal(
user_name=principal.getId(), user_name=principal.getId(),
path=self.getPhysicalPath()) path=self.getPhysicalPath())
except ConflictError:
raise
except:
# Hiding this exception is necessary in order
# to be able to configure database connection
# on a existing site.
# Improved version may use ProgrammingError
# and DatabaseError exceptions explicitely
LOG('ERP5GroupManager', WARNING,
'could not call _getGroupsForPrincipal probably because of '
'misconfigured database connection',
error = sys.exc_info())
return ()
classImplements( ERP5GroupManager classImplements( ERP5GroupManager
, IGroupsPlugin , IGroupsPlugin
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment