[Checkins] SVN: Products.CMFCore/trunk/Products/CMFCore/ No longer catch a `NotImplemented` string exception in the MembershipTool in deleteMembers. A grep doesn't find such a string exception in any Zope/CMF/Plone code.

[Hanno Schlichting]

Log message for revision 94816:
  No longer catch a `NotImplemented` string exception in the MembershipTool in deleteMembers. A grep doesn't find such a string exception in any Zope/CMF/Plone code.
  

Changed:
  U   Products.CMFCore/trunk/Products/CMFCore/CHANGES.txt
  U   Products.CMFCore/trunk/Products/CMFCore/MembershipTool.py

-=-
Modified: Products.CMFCore/trunk/Products/CMFCore/CHANGES.txt
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/CHANGES.txt	2009-01-17 22:10:05 UTC (rev 94815)
+++ Products.CMFCore/trunk/Products/CMFCore/CHANGES.txt	2009-01-17 22:19:15 UTC (rev 94816)
@@ -4,6 +4,9 @@
 2.2.0 (unreleased)
 ------------------
 
+- No longer catch a `NotImplemented` string exception in the MembershipTool
+  in deleteMembers.
+
 - Added `__name__` to the FSPythonScript execution scope in addition to
   `__file__`. This makes Python 2.6's warnings module happy.
 

Modified: Products.CMFCore/trunk/Products/CMFCore/MembershipTool.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/MembershipTool.py	2009-01-17 22:10:05 UTC (rev 94815)
+++ Products.CMFCore/trunk/Products/CMFCore/MembershipTool.py	2009-01-17 22:19:15 UTC (rev 94816)
@@ -502,7 +502,7 @@
                     member_ids.remove(member_id)
             try:
                 acl_users.userFolderDelUsers(member_ids)
-            except (AttributeError, NotImplementedError, 'NotImplemented'):
+            except (AttributeError, NotImplementedError):
                 raise NotImplementedError('The underlying User Folder '
                                          'doesn\'t support deleting members.')
         else: