[Collective-checkins] r225968 - collective.pm/trunk/src/collective/pm/group

[Ross P. <svn...@pl...>]

Author: rossp
Date: Wed Nov  3 21:50:36 2010
New Revision: 225968

Modified:
   collective.pm/trunk/src/collective/pm/group/form.py
Log:
Clarify the logging of empty principal names.  Should increase the
usefulness of logging and let an exception be raised in cases when it
should be.

Modified: collective.pm/trunk/src/collective/pm/group/form.py
==============================================================================
--- collective.pm/trunk/src/collective/pm/group/form.py	(original)
+++ collective.pm/trunk/src/collective/pm/group/form.py	Wed Nov  3 21:50:36 2010
@@ -14,20 +14,22 @@
 
 
 def flatten(acl_users, principal):
-    if principal:
-        group = acl_users.getGroup(principal)
-        if group is not None:
-            for member in group.getMemberIds():
-                for user in flatten(acl_users, member):
-                    yield user
-        else:
-            user = acl_users.getUser(principal)
-            if user is None:
+    group = acl_users.getGroup(principal)
+    if group is not None:
+        for member in group.getMemberIds():
+            if not member:
                 logger.error(
-                    'No group or user found for %r' % principal)
-            else:
+                    'getMemberIds() returned empty member for %r.' % group)
+                continue
+            for user in flatten(acl_users, member):
                 yield user
-    logger.error('Empty principal passed to flatten().')
+    else:
+        user = acl_users.getUser(principal)
+        if user is None:
+            logger.error(
+                'No group or user found for %r' % principal)
+        else:
+            yield user
 
 
 class GroupMembersSource(object):