[Checkins] SVN: zope.securitypolicy/trunk/ pep8 cleanup
Vincent Fretin
vincent.fretin at gmail.com
Sat Jan 23 11:13:16 EST 2010
Log message for revision 108405:
pep8 cleanup
Changed:
U zope.securitypolicy/trunk/CHANGES.txt
U zope.securitypolicy/trunk/setup.py
U zope.securitypolicy/trunk/src/zope/securitypolicy/grantinfo.py
U zope.securitypolicy/trunk/src/zope/securitypolicy/interfaces.py
U zope.securitypolicy/trunk/src/zope/securitypolicy/metaconfigure.py
U zope.securitypolicy/trunk/src/zope/securitypolicy/metadirectives.py
U zope.securitypolicy/trunk/src/zope/securitypolicy/principalpermission.py
U zope.securitypolicy/trunk/src/zope/securitypolicy/principalrole.py
U zope.securitypolicy/trunk/src/zope/securitypolicy/role.py
U zope.securitypolicy/trunk/src/zope/securitypolicy/securitymap.py
U zope.securitypolicy/trunk/src/zope/securitypolicy/settings.py
U zope.securitypolicy/trunk/src/zope/securitypolicy/zopepolicy.py
-=-
Modified: zope.securitypolicy/trunk/CHANGES.txt
===================================================================
--- zope.securitypolicy/trunk/CHANGES.txt 2010-01-23 14:20:41 UTC (rev 108404)
+++ zope.securitypolicy/trunk/CHANGES.txt 2010-01-23 16:13:16 UTC (rev 108405)
@@ -5,6 +5,8 @@
3.6.2 (unreleased)
------------------
+- Removed unused imports and pep8 cleanup.
+
- Use doctest module instead of the deprecated zope.testing.doctest.
- AnnotationGrantInfo implements IGrantInfo.
Modified: zope.securitypolicy/trunk/setup.py
===================================================================
--- zope.securitypolicy/trunk/setup.py 2010-01-23 14:20:41 UTC (rev 108404)
+++ zope.securitypolicy/trunk/setup.py 2010-01-23 16:13:16 UTC (rev 108405)
@@ -25,11 +25,12 @@
from setuptools import setup, find_packages
+
def read(*rnames):
return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
setup(name='zope.securitypolicy',
- version = '3.6.2dev',
+ version='3.6.2dev',
author='Zope Corporation and Contributors',
author_email='zope-dev at zope.org',
description='Default security policy for Zope3',
@@ -38,8 +39,7 @@
+ '\n.. contents::\n\n' +
read('src', 'zope', 'securitypolicy', 'zopepolicy.txt')
+ '\n\n' +
- read('CHANGES.txt')
- ),
+ read('CHANGES.txt')),
keywords="zope3 security policy",
classifiers=[
'Development Status :: 5 - Production/Stable',
Modified: zope.securitypolicy/trunk/src/zope/securitypolicy/grantinfo.py
===================================================================
--- zope.securitypolicy/trunk/src/zope/securitypolicy/grantinfo.py 2010-01-23 14:20:41 UTC (rev 108404)
+++ zope.securitypolicy/trunk/src/zope/securitypolicy/grantinfo.py 2010-01-23 16:13:16 UTC (rev 108405)
@@ -35,6 +35,7 @@
rolepermkey = AnnotationRolePermissionManager.key
del AnnotationRolePermissionManager
+
class AnnotationGrantInfo(object):
implements(IGrantInfo)
@@ -48,16 +49,16 @@
prinper = annotations.get(prinperkey)
if prinper is not None:
- self.prinper = prinper._bycol # by principals
+ self.prinper = prinper._bycol # by principals
prinrole = annotations.get(prinrolekey)
if prinrole is not None:
- self.prinrole = prinrole._bycol # by principals
+ self.prinrole = prinrole._bycol # by principals
roleper = annotations.get(rolepermkey)
if roleper is not None:
- self.permrole = roleper._byrow # by permission
-
+ self.permrole = roleper._byrow # by permission
+
def __nonzero__(self):
return bool(self.prinper or self.prinrole or self.permrole)
Modified: zope.securitypolicy/trunk/src/zope/securitypolicy/interfaces.py
===================================================================
--- zope.securitypolicy/trunk/src/zope/securitypolicy/interfaces.py 2010-01-23 14:20:41 UTC (rev 108404)
+++ zope.securitypolicy/trunk/src/zope/securitypolicy/interfaces.py 2010-01-23 16:13:16 UTC (rev 108405)
@@ -48,7 +48,6 @@
required=False)
-
class IPrincipalRoleMap(Interface):
"""Mappings between principals and roles."""
@@ -209,6 +208,7 @@
principal.
"""
+
class IGrantInfo(Interface):
"""Get grant info needed for checking access
"""
@@ -233,5 +233,6 @@
setting is either Allow or Deny.
"""
+
class IGrantVocabulary(Interface):
"""Marker interface for register the RadioWidget."""
Modified: zope.securitypolicy/trunk/src/zope/securitypolicy/metaconfigure.py
===================================================================
--- zope.securitypolicy/trunk/src/zope/securitypolicy/metaconfigure.py 2010-01-23 14:20:41 UTC (rev 108404)
+++ zope.securitypolicy/trunk/src/zope/securitypolicy/metaconfigure.py 2010-01-23 16:13:16 UTC (rev 108405)
@@ -18,8 +18,8 @@
from zope.configuration.exceptions import ConfigurationError
from zope.component.zcml import utility
-from zope.securitypolicy.interfaces import IRole
-from zope.securitypolicy.role import Role
+from zope.securitypolicy.interfaces import IRole
+from zope.securitypolicy.role import Role
from zope.securitypolicy.rolepermission import \
rolePermissionManager as role_perm_mgr
from zope.securitypolicy.principalpermission import \
@@ -31,8 +31,7 @@
def grant(_context, principal=None, role=None, permission=None):
nspecified = ((principal is not None)
+ (role is not None)
- + (permission is not None)
- )
+ + (permission is not None))
if nspecified != 2:
raise ConfigurationError(
@@ -42,31 +41,31 @@
if principal:
if role:
_context.action(
- discriminator = ('grantRoleToPrincipal', role, principal),
- callable = principal_role_mgr.assignRoleToPrincipal,
- args = (role, principal)
+ discriminator=('grantRoleToPrincipal', role, principal),
+ callable=principal_role_mgr.assignRoleToPrincipal,
+ args=(role, principal),
)
else:
_context.action(
- discriminator = ('grantPermissionToPrincipal',
- permission,
- principal),
- callable = principal_perm_mgr.grantPermissionToPrincipal,
- args = (permission, principal)
+ discriminator=('grantPermissionToPrincipal',
+ permission,
+ principal),
+ callable=principal_perm_mgr.grantPermissionToPrincipal,
+ args=(permission, principal),
)
else:
_context.action(
- discriminator = ('grantPermissionToRole', permission, role),
- callable = role_perm_mgr.grantPermissionToRole,
- args = (permission, role)
+ discriminator=('grantPermissionToRole', permission, role),
+ callable=role_perm_mgr.grantPermissionToRole,
+ args=(permission, role),
)
+
def grantAll(_context, principal=None, role=None):
"""Grant all permissions to a role or principal
"""
nspecified = ((principal is not None)
- + (role is not None)
- )
+ + (role is not None))
if nspecified != 1:
raise ConfigurationError(
@@ -75,21 +74,19 @@
if principal:
_context.action(
- discriminator = ('grantAllPermissionsToPrincipal',
- principal),
- callable =
- principal_perm_mgr.grantAllPermissionsToPrincipal,
- args = (principal, )
+ discriminator=('grantAllPermissionsToPrincipal',
+ principal),
+ callable=principal_perm_mgr.grantAllPermissionsToPrincipal,
+ args=(principal, ),
)
else:
_context.action(
- discriminator = ('grantAllPermissionsToRole', role),
- callable = role_perm_mgr.grantAllPermissionsToRole,
- args = (role, )
+ discriminator=('grantAllPermissionsToRole', role),
+ callable=role_perm_mgr.grantAllPermissionsToRole,
+ args=(role, ),
)
def defineRole(_context, id, title, description=''):
role = Role(id, title, description)
utility(_context, IRole, role, name=id)
-
Modified: zope.securitypolicy/trunk/src/zope/securitypolicy/metadirectives.py
===================================================================
--- zope.securitypolicy/trunk/src/zope/securitypolicy/metadirectives.py 2010-01-23 14:20:41 UTC (rev 108404)
+++ zope.securitypolicy/trunk/src/zope/securitypolicy/metadirectives.py 2010-01-23 16:13:16 UTC (rev 108405)
@@ -16,9 +16,10 @@
$Id$
"""
from zope.interface import Interface
-from zope.schema import Id
+from zope.schema import Id
from zope.security.zcml import Permission, IPermissionDirective
+
class IGrantAllDirective(Interface):
"""Grant Permissions to roles and principals and roles to principals."""
@@ -32,6 +33,7 @@
description=u"Specifies the Role to be mapped.",
required=False)
+
class IGrantDirective(IGrantAllDirective):
"""Grant Permissions to roles and principals and roles to principals."""
@@ -40,6 +42,6 @@
description=u"Specifies the Permission to be mapped.",
required=False)
+
class IDefineRoleDirective(IPermissionDirective):
"""Define a new role."""
-
Modified: zope.securitypolicy/trunk/src/zope/securitypolicy/principalpermission.py
===================================================================
--- zope.securitypolicy/trunk/src/zope/securitypolicy/principalpermission.py 2010-01-23 14:20:41 UTC (rev 108404)
+++ zope.securitypolicy/trunk/src/zope/securitypolicy/principalpermission.py 2010-01-23 16:13:16 UTC (rev 108405)
@@ -50,7 +50,7 @@
def getSetting(self, permission_id, principal_id, default=Unset):
return AnnotationSecurityMap.queryCell(
self, permission_id, principal_id, default)
-
+
getPrincipalsAndPermissions = AnnotationSecurityMap.getAllCells
Modified: zope.securitypolicy/trunk/src/zope/securitypolicy/principalrole.py
===================================================================
--- zope.securitypolicy/trunk/src/zope/securitypolicy/principalrole.py 2010-01-23 14:20:41 UTC (rev 108404)
+++ zope.securitypolicy/trunk/src/zope/securitypolicy/principalrole.py 2010-01-23 16:13:16 UTC (rev 108405)
@@ -43,7 +43,7 @@
unsetRoleForPrincipal = AnnotationSecurityMap.delCell
getPrincipalsForRole = AnnotationSecurityMap.getRow
getRolesForPrincipal = AnnotationSecurityMap.getCol
-
+
def getSetting(self, role_id, principal_id):
return AnnotationSecurityMap.queryCell(
self, role_id, principal_id, default=Unset)
Modified: zope.securitypolicy/trunk/src/zope/securitypolicy/role.py
===================================================================
--- zope.securitypolicy/trunk/src/zope/securitypolicy/role.py 2010-01-23 14:20:41 UTC (rev 108404)
+++ zope.securitypolicy/trunk/src/zope/securitypolicy/role.py 2010-01-23 16:13:16 UTC (rev 108405)
@@ -46,6 +46,7 @@
self.title = title
self.description = description
+
def setIdOnActivation(role, event):
"""Set the permission id upon registration activation.
@@ -102,7 +103,6 @@
role.id = NULL_ID
-
def checkRole(context, role_id):
names = [name for name, util in getUtilitiesFor(IRole, context)]
if not role_id in names:
Modified: zope.securitypolicy/trunk/src/zope/securitypolicy/securitymap.py
===================================================================
--- zope.securitypolicy/trunk/src/zope/securitypolicy/securitymap.py 2010-01-23 14:20:41 UTC (rev 108404)
+++ zope.securitypolicy/trunk/src/zope/securitypolicy/securitymap.py 2010-01-23 16:13:16 UTC (rev 108405)
@@ -19,6 +19,7 @@
from zope.annotation import IAnnotations
from zope.security.management import queryInteraction
+
class SecurityMap(object):
def __init__(self):
@@ -44,12 +45,12 @@
col = self._bycol.get(colentry)
if not col:
col = self._bycol[colentry] = {}
-
+
row[colentry] = value
col[rowentry] = value
self._invalidated_interaction_cache()
-
+
return True
def _invalidated_interaction_cache(self):
@@ -115,6 +116,7 @@
res.append((r,) + c)
return res
+
class PersistentSecurityMap(SecurityMap, Persistent):
def addCell(self, rowentry, colentry, value):
@@ -125,6 +127,7 @@
if SecurityMap.delCell(self, rowentry, colentry):
self._p_changed = 1
+
class AnnotationSecurityMap(SecurityMap):
def __init__(self, context):
@@ -158,4 +161,3 @@
def delCell(self, rowentry, colentry):
if SecurityMap.delCell(self, rowentry, colentry):
self._changed()
-
Modified: zope.securitypolicy/trunk/src/zope/securitypolicy/settings.py
===================================================================
--- zope.securitypolicy/trunk/src/zope/securitypolicy/settings.py 2010-01-23 14:20:41 UTC (rev 108404)
+++ zope.securitypolicy/trunk/src/zope/securitypolicy/settings.py 2010-01-23 16:13:16 UTC (rev 108405)
@@ -20,6 +20,7 @@
$Id$
"""
+
class PermissionSetting(object):
"""PermissionSettings should be considered as immutable.
They can be compared by identity. They are identified by
Modified: zope.securitypolicy/trunk/src/zope/securitypolicy/zopepolicy.py
===================================================================
--- zope.securitypolicy/trunk/src/zope/securitypolicy/zopepolicy.py 2010-01-23 14:20:41 UTC (rev 108404)
+++ zope.securitypolicy/trunk/src/zope/securitypolicy/zopepolicy.py 2010-01-23 16:13:16 UTC (rev 108405)
@@ -25,7 +25,9 @@
from zope.security.interfaces import ISecurityPolicy
from zope.security.proxy import removeSecurityProxy
-from zope.authentication.interfaces import PrincipalLookupError, IAuthentication
+from zope.authentication.interfaces import (
+ PrincipalLookupError,
+ IAuthentication)
from zope.securitypolicy.principalpermission import principalPermissionManager
globalPrincipalPermissionSetting = principalPermissionManager.getSetting
@@ -43,9 +45,11 @@
SettingAsBoolean = {Allow: True, Deny: False, Unset: None, None: None}
+
class CacheEntry:
pass
+
class ZopeSecurityPolicy(ParanoidSecurityPolicy):
zope.interface.classProvides(ISecurityPolicy)
@@ -127,16 +131,14 @@
if parent is None:
prinper = SettingAsBoolean[
- globalPrincipalPermissionSetting(permission, principal, None)
- ]
+ globalPrincipalPermissionSetting(permission, principal, None)]
cache_prin_per[permission] = prinper
return prinper
prinper = IPrincipalPermissionMap(parent, None)
if prinper is not None:
prinper = SettingAsBoolean[
- prinper.getSetting(permission, principal, None)
- ]
+ prinper.getSetting(permission, principal, None)]
if prinper is not None:
cache_prin_per[permission] = prinper
return prinper
@@ -184,9 +186,7 @@
roles = dict(
[(role, 1)
for (role, setting) in globalRolesForPermission(permission)
- if setting is Allow
- ]
- )
+ if setting is Allow])
cache_roles[permission] = roles
return roles
@@ -238,10 +238,8 @@
if parent is None:
roles = dict(
[(role, SettingAsBoolean[setting])
- for (role, setting) in globalRolesForPrincipal(principal)
- ]
- )
- roles['zope.Anonymous'] = True # Everybody has Anonymous
+ for (role, setting) in globalRolesForPrincipal(principal)])
+ roles['zope.Anonymous'] = True # Everybody has Anonymous
cache_principal_roles[principal] = roles
return roles
@@ -318,6 +316,7 @@
return groups
+
def settingsForObject(ob):
"""Analysis tool to show all of the grants to a process
"""
@@ -370,4 +369,3 @@
for (p, r, s) in settings]
return result
-
More information about the checkins
mailing list