[Checkins]
SVN: z3c.securitytool/trunk/src/z3c/securitytool/securitytool.py
Misc formatting and cleanup
Daniel Blackburn
blackburnd at gmail.com
Mon Feb 18 19:01:22 EST 2008
Log message for revision 84037:
Misc formatting and cleanup
Changed:
U z3c.securitytool/trunk/src/z3c/securitytool/securitytool.py
-=-
Modified: z3c.securitytool/trunk/src/z3c/securitytool/securitytool.py
===================================================================
--- z3c.securitytool/trunk/src/z3c/securitytool/securitytool.py 2008-02-18 23:16:32 UTC (rev 84036)
+++ z3c.securitytool/trunk/src/z3c/securitytool/securitytool.py 2008-02-19 00:01:21 UTC (rev 84037)
@@ -410,24 +410,31 @@
# Here we want to aggregate all the rolePermissions in one place
rolePermissions = []
if not settings:
- return {'read_perm':'zope.Public','permissions': [],'roles': [],'groups': {}}
+ return {'read_perm':'zope.Public',
+ 'permissions': [],
+ 'roles': [],
+ 'groups': {}}
if read_perm is None:
- prinPermSettings = {'permissions': [],'roles': [],'groups': {}}
+ prinPermSettings = {'permissions': [],
+ 'roles': [],
+ 'groups': {}}
read_perm ='zope.Public'
else:
for name,setting in settings:
if setting.get('rolePermissions',''):
rolePermissions.extend(setting['rolePermissions'])
- prinPermSettings = self._permissionDetails(principal, read_perm,
- settings,rolePermissions)
+ prinPermSettings = self._permissionDetails(principal,
+ read_perm,
+ settings,
+ rolePermissions)
prinPermSettings['read_perm'] = read_perm
return prinPermSettings
- def _permissionDetails(self, principal, read_perm, settings, rolePermissions):
+ def _permissionDetails(self,principal,read_perm,settings, rolePermissions):
"""Recursively get the permission details for a given principal and
permission from a security mapping.
"""
@@ -439,7 +446,6 @@
for name, setting in settings:
prinPermMap = setting.get('principalPermissions', ())
prinRoleMap = setting.get('principalRoles', ())
- #rolePermMap = setting.get('rolePermissions', ())
rolePermMap = rolePermissions
permSetting = principalDirectlyProvidesPermission(prinPermMap,
principal.id, read_perm)
More information about the Checkins
mailing list