[Erp5-report] r19223 - /erp5/trunk/products/ERP5Security/ERP5GroupManager.py

[nobody at svn.erp5.org]

Author: romain
Date: Mon Feb 11 11:35:31 2008
New Revision: 19223

URL: http://svn.erp5.org?rev=19223&view=rev
Log:
Revert revision 19203.
Do not use except without Exception name.

Modified:
    erp5/trunk/products/ERP5Security/ERP5GroupManager.py

Modified: erp5/trunk/products/ERP5Security/ERP5GroupManager.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Security/ERP5GroupManager.py?rev=19223&r1=19222&r2=19223&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Security/ERP5GroupManager.py (original)
+++ erp5/trunk/products/ERP5Security/ERP5GroupManager.py Mon Feb 11 11:35:31 2008
@@ -26,7 +26,6 @@
 from Products.ERP5Type.Cache import CachingMethod
 from Products.PluggableAuthService.PropertiedUser import PropertiedUser
 from ZODB.POSException import ConflictError
-from Shared.DC.ZRDB.DA import DatabaseError
 
 import sys
 
@@ -184,23 +183,10 @@
                                              id='ERP5GroupManager_getGroupsForPrincipal',
                                              cache_factory='erp5_content_short')
 
-    try:
-      return _getGroupsForPrincipal(
+    return _getGroupsForPrincipal(
                 user_name=principal.getId(),
                 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
                , IGroupsPlugin