[Checkins] SVN: z3c.securitytool/trunk/src/z3c/securitytool/ Fixed mergePermissionsFromGroups, list of principals needed to be principal objects instead of principal ids

Daniel Blackburn blackburnd at gmail.com
Wed May 28 14:51:05 EDT 2008


Log message for revision 87001:
  Fixed mergePermissionsFromGroups, list of principals needed to be principal objects instead of principal ids

Changed:
  U   z3c.securitytool/trunk/src/z3c/securitytool/README.txt
  U   z3c.securitytool/trunk/src/z3c/securitytool/securitytool.py

-=-
Modified: z3c.securitytool/trunk/src/z3c/securitytool/README.txt
===================================================================
--- z3c.securitytool/trunk/src/z3c/securitytool/README.txt	2008-05-28 18:49:23 UTC (rev 87000)
+++ z3c.securitytool/trunk/src/z3c/securitytool/README.txt	2008-05-28 18:51:04 UTC (rev 87001)
@@ -178,6 +178,7 @@
     ['zope.daniel',
      'zope.globalmgr',
      'zope.group1',
+     'zope.group2',
      'zope.markus',
      'zope.martin',
      'zope.mgr',
@@ -316,17 +317,20 @@
     ReadIssue.html
 
     >>> pprint(prinPerms)
-    {'groups': {'zope.group1': {'groups': {},
-                                'permissionTree': [],
-                                'permissions': [],
-                                'roleTree': [],
-                                'roles': {}}},
-     'permissionTree': [],
-     'permissions': [],
-     'roleTree': [],
-     'roles': {}}
+     {'groups': {'zope.group1': {'groups': {'zope.group2': {'groups': {},
+                                                            'permissionTree': [],
+                                                            'permissions': [],
+                                                            'roleTree': [],
+                                                            'roles': {}}},
+                                 'permissionTree': [],
+                                 'permissions': [],
+                                 'roleTree': [],
+                                 'roles': {}}},
+      'permissionTree': [],
+      'permissions': [],
+      'roleTree': [],
+      'roles': {}}
 
-
 Following are the helper functions used within the securitytool, These
 contain a set of common functionality that is used in many places.
 Lets see if the 'hasPermissionSetting' method returns True if there is

Modified: z3c.securitytool/trunk/src/z3c/securitytool/securitytool.py
===================================================================
--- z3c.securitytool/trunk/src/z3c/securitytool/securitytool.py	2008-05-28 18:49:23 UTC (rev 87000)
+++ z3c.securitytool/trunk/src/z3c/securitytool/securitytool.py	2008-05-28 18:51:04 UTC (rev 87001)
@@ -200,7 +200,7 @@
                 # If we have further groups... recurse
                 group = sysPrincipals.getPrincipal(group_id)
                 if group.groups:
-                    mergePermissionsFromGroups(group.groups)
+                    self.mergePermissionsFromGroups([sysPrincipals.getPrincipal(x) for x in group.groups])
 
                 if matrix.has_key(group_id):
                     res = matrix[group_id]



More information about the Checkins mailing list