[Checkins]
SVN: zope.securitypolicy/trunk/src/zope/app/securitypolicy/
Move core component from zope.app.securitypolicy to
zope.securitypolicy
Roger Ineichen
roger at projekt01.ch
Wed Sep 26 10:58:40 EDT 2007
Log message for revision 80107:
Move core component from zope.app.securitypolicy to zope.securitypolicy
Changed:
D zope.securitypolicy/trunk/src/zope/app/securitypolicy/browser/
U zope.securitypolicy/trunk/src/zope/app/securitypolicy/configure.zcml
D zope.securitypolicy/trunk/src/zope/app/securitypolicy/ftesting.zcml
U zope.securitypolicy/trunk/src/zope/app/securitypolicy/grantinfo.py
U zope.securitypolicy/trunk/src/zope/app/securitypolicy/metaconfigure.py
U zope.securitypolicy/trunk/src/zope/app/securitypolicy/principalpermission.py
U zope.securitypolicy/trunk/src/zope/app/securitypolicy/principalrole.py
U zope.securitypolicy/trunk/src/zope/app/securitypolicy/role.py
U zope.securitypolicy/trunk/src/zope/app/securitypolicy/rolepermission.py
U zope.securitypolicy/trunk/src/zope/app/securitypolicy/securitypolicy.zcml
D zope.securitypolicy/trunk/src/zope/app/securitypolicy/testing.py
D zope.securitypolicy/trunk/src/zope/app/securitypolicy/tests/functional.py
D zope.securitypolicy/trunk/src/zope/app/securitypolicy/tests/functional.zcml
U zope.securitypolicy/trunk/src/zope/app/securitypolicy/tests/mapping.zcml
U zope.securitypolicy/trunk/src/zope/app/securitypolicy/tests/role.zcml
U zope.securitypolicy/trunk/src/zope/app/securitypolicy/tests/role_duplicate.zcml
U zope.securitypolicy/trunk/src/zope/app/securitypolicy/tests/test_annotationprincipalpermissionmanager.py
U zope.securitypolicy/trunk/src/zope/app/securitypolicy/tests/test_annotationprincipalrolemanager.py
U zope.securitypolicy/trunk/src/zope/app/securitypolicy/tests/test_annotationrolepermissionmanager.py
U zope.securitypolicy/trunk/src/zope/app/securitypolicy/tests/test_principalpermissionmanager.py
U zope.securitypolicy/trunk/src/zope/app/securitypolicy/tests/test_principalrolemanager.py
U zope.securitypolicy/trunk/src/zope/app/securitypolicy/tests/test_role.py
U zope.securitypolicy/trunk/src/zope/app/securitypolicy/tests/test_rolepermissionmanager.py
U zope.securitypolicy/trunk/src/zope/app/securitypolicy/tests/test_securitydirectives.py
U zope.securitypolicy/trunk/src/zope/app/securitypolicy/tests/test_securitymap.py
U zope.securitypolicy/trunk/src/zope/app/securitypolicy/tests/test_vocabulary.py
U zope.securitypolicy/trunk/src/zope/app/securitypolicy/tests/test_zopepolicy.py
U zope.securitypolicy/trunk/src/zope/app/securitypolicy/vocabulary.py
U zope.securitypolicy/trunk/src/zope/app/securitypolicy/zopepolicy.py
U zope.securitypolicy/trunk/src/zope/app/securitypolicy/zopepolicy.txt
-=-
Modified: zope.securitypolicy/trunk/src/zope/app/securitypolicy/configure.zcml
===================================================================
--- zope.securitypolicy/trunk/src/zope/app/securitypolicy/configure.zcml 2007-09-26 14:51:44 UTC (rev 80106)
+++ zope.securitypolicy/trunk/src/zope/app/securitypolicy/configure.zcml 2007-09-26 14:58:39 UTC (rev 80107)
@@ -1,7 +1,6 @@
<configure
xmlns="http://namespaces.zope.org/zope"
- i18n_domain="zope"
- >
+ i18n_domain="zope">
<adapter
factory=".rolepermission.AnnotationRolePermissionManager"
@@ -90,12 +89,7 @@
handler=".role.unsetIdOnDeactivation"
/>
- <!-- Include browser package -->
- <include package=".browser" />
-
-
<!-- Vocabularies -->
-
<utility
component=".vocabulary.RoleIdsVocabulary"
name="Role Ids"
Deleted: zope.securitypolicy/trunk/src/zope/app/securitypolicy/ftesting.zcml
===================================================================
--- zope.securitypolicy/trunk/src/zope/app/securitypolicy/ftesting.zcml 2007-09-26 14:51:44 UTC (rev 80106)
+++ zope.securitypolicy/trunk/src/zope/app/securitypolicy/ftesting.zcml 2007-09-26 14:58:39 UTC (rev 80107)
@@ -1,41 +0,0 @@
-<configure
- xmlns="http://namespaces.zope.org/zope"
- i18n_domain="zope"
- package="zope.app.securitypolicy"
- >
-
- <!-- This file is the equivalent of site.zcml and it is -->
- <!-- used for functional testing setup -->
-
- <include package="zope.app.securitypolicy" file="meta.zcml" />
-
- <include package="zope.app.zcmlfiles" />
- <include package="zope.app.authentication" />
- <include package="zope.app.securitypolicy" />
-
- <securityPolicy
- component="zope.app.securitypolicy.zopepolicy.ZopeSecurityPolicy" />
-
- <role id="zope.Manager" title="Site Manager" />
- <role id="zope.Member" title="Site Member" />
-
- <grantAll role="zope.Manager" />
- <include package="zope.app.securitypolicy.tests" file="functional.zcml" />
-
- <!-- Principal that tests generally run as -->
- <principal
- id="zope.mgr"
- title="Manager"
- login="mgr"
- password="mgrpw" />
-
- <!-- Bootstrap principal used to make local grant to the principal above -->
- <principal
- id="zope.globalmgr"
- title="Manager"
- login="globalmgr"
- password="globalmgrpw" />
-
- <grant role="zope.Manager" principal="zope.globalmgr" />
-
-</configure>
Modified: zope.securitypolicy/trunk/src/zope/app/securitypolicy/grantinfo.py
===================================================================
--- zope.securitypolicy/trunk/src/zope/app/securitypolicy/grantinfo.py 2007-09-26 14:51:44 UTC (rev 80106)
+++ zope.securitypolicy/trunk/src/zope/app/securitypolicy/grantinfo.py 2007-09-26 14:58:39 UTC (rev 80107)
@@ -16,21 +16,21 @@
$Id$
"""
from zope.annotation.interfaces import IAnnotations
-from zope.app.securitypolicy.interfaces import Unset
-from zope.app.securitypolicy.interfaces import IGrantInfo
+from zope.securitypolicy.interfaces import Unset
+from zope.securitypolicy.interfaces import IGrantInfo
-from zope.app.securitypolicy.principalpermission \
- import AnnotationPrincipalPermissionManager
+from zope.securitypolicy.principalpermission import \
+ AnnotationPrincipalPermissionManager
prinperkey = AnnotationPrincipalPermissionManager.key
del AnnotationPrincipalPermissionManager
-from zope.app.securitypolicy.principalrole \
- import AnnotationPrincipalRoleManager
+from zope.securitypolicy.principalrole import \
+ AnnotationPrincipalRoleManager
prinrolekey = AnnotationPrincipalRoleManager.key
del AnnotationPrincipalRoleManager
-from zope.app.securitypolicy.rolepermission \
- import AnnotationRolePermissionManager
+from zope.securitypolicy.rolepermission import \
+ AnnotationRolePermissionManager
rolepermkey = AnnotationRolePermissionManager.key
del AnnotationRolePermissionManager
Modified: zope.securitypolicy/trunk/src/zope/app/securitypolicy/metaconfigure.py
===================================================================
--- zope.securitypolicy/trunk/src/zope/app/securitypolicy/metaconfigure.py 2007-09-26 14:51:44 UTC (rev 80106)
+++ zope.securitypolicy/trunk/src/zope/app/securitypolicy/metaconfigure.py 2007-09-26 14:58:39 UTC (rev 80107)
@@ -18,14 +18,14 @@
from zope.configuration.exceptions import ConfigurationError
from zope.component.zcml import utility
-from zope.app.securitypolicy.interfaces import IRole
-from zope.app.securitypolicy.role import Role
-from zope.app.securitypolicy.rolepermission \
- import rolePermissionManager as role_perm_mgr
-from zope.app.securitypolicy.principalpermission \
- import principalPermissionManager as principal_perm_mgr
-from zope.app.securitypolicy.principalrole \
- import principalRoleManager as principal_role_mgr
+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 \
+ principalPermissionManager as principal_perm_mgr
+from zope.securitypolicy.principalrole import \
+ principalRoleManager as principal_role_mgr
def grant(_context, principal=None, role=None, permission=None):
Modified: zope.securitypolicy/trunk/src/zope/app/securitypolicy/principalpermission.py
===================================================================
--- zope.securitypolicy/trunk/src/zope/app/securitypolicy/principalpermission.py 2007-09-26 14:51:44 UTC (rev 80106)
+++ zope.securitypolicy/trunk/src/zope/app/securitypolicy/principalpermission.py 2007-09-26 14:58:39 UTC (rev 80107)
@@ -19,11 +19,12 @@
from zope.interface import implements
from zope.security.permission import allPermissions
+from zope.securitypolicy.interfaces import Allow, Deny, Unset
+from zope.securitypolicy.interfaces import IPrincipalPermissionManager
+from zope.securitypolicy.securitymap import SecurityMap
+from zope.securitypolicy.securitymap import AnnotationSecurityMap
+
from zope.app.security.principal import checkPrincipal
-from zope.app.securitypolicy.interfaces import Allow, Deny, Unset
-from zope.app.securitypolicy.interfaces import IPrincipalPermissionManager
-from zope.app.securitypolicy.securitymap import SecurityMap
-from zope.app.securitypolicy.securitymap import AnnotationSecurityMap
class AnnotationPrincipalPermissionManager(AnnotationSecurityMap):
Modified: zope.securitypolicy/trunk/src/zope/app/securitypolicy/principalrole.py
===================================================================
--- zope.securitypolicy/trunk/src/zope/app/securitypolicy/principalrole.py 2007-09-26 14:51:44 UTC (rev 80106)
+++ zope.securitypolicy/trunk/src/zope/app/securitypolicy/principalrole.py 2007-09-26 14:58:39 UTC (rev 80107)
@@ -17,15 +17,14 @@
"""
from zope.interface import implements
-from zope.app.securitypolicy.interfaces import Allow, Deny, Unset
-from zope.app.securitypolicy.interfaces import IPrincipalRoleManager
-
-from zope.app.securitypolicy.securitymap import SecurityMap
-from zope.app.securitypolicy.securitymap import AnnotationSecurityMap
-
+from zope.securitypolicy.interfaces import Allow, Deny, Unset
+from zope.securitypolicy.interfaces import IPrincipalRoleManager
+from zope.securitypolicy.securitymap import SecurityMap
+from zope.securitypolicy.securitymap import AnnotationSecurityMap
+from zope.securitypolicy.role import checkRole
from zope.app.security.principal import checkPrincipal
-from zope.app.securitypolicy.role import checkRole
+
class AnnotationPrincipalRoleManager(AnnotationSecurityMap):
"""Mappings between principals and roles."""
Modified: zope.securitypolicy/trunk/src/zope/app/securitypolicy/role.py
===================================================================
--- zope.securitypolicy/trunk/src/zope/app/securitypolicy/role.py 2007-09-26 14:51:44 UTC (rev 80106)
+++ zope.securitypolicy/trunk/src/zope/app/securitypolicy/role.py 2007-09-26 14:58:39 UTC (rev 80107)
@@ -23,7 +23,7 @@
from zope.component import getUtilitiesFor
from zope.location import Location
-from zope.app.securitypolicy.interfaces import IRole
+from zope.securitypolicy.interfaces import IRole
from zope.i18nmessageid import ZopeMessageFactory as _
NULL_ID = _('<role not activated>')
Modified: zope.securitypolicy/trunk/src/zope/app/securitypolicy/rolepermission.py
===================================================================
--- zope.securitypolicy/trunk/src/zope/app/securitypolicy/rolepermission.py 2007-09-26 14:51:44 UTC (rev 80106)
+++ zope.securitypolicy/trunk/src/zope/app/securitypolicy/rolepermission.py 2007-09-26 14:58:39 UTC (rev 80107)
@@ -18,15 +18,14 @@
from zope.interface import implements
from zope.security.permission import allPermissions
-from zope.app.securitypolicy.role import checkRole
+from zope.securitypolicy.role import checkRole
+from zope.securitypolicy.interfaces import Allow, Deny, Unset
+from zope.securitypolicy.interfaces import IRolePermissionManager
+from zope.securitypolicy.interfaces import IRolePermissionMap
+from zope.securitypolicy.securitymap import AnnotationSecurityMap
+from zope.securitypolicy.securitymap import SecurityMap
-from zope.app.securitypolicy.interfaces import Allow, Deny, Unset
-from zope.app.securitypolicy.interfaces import IRolePermissionManager
-from zope.app.securitypolicy.interfaces import IRolePermissionMap
-from zope.app.securitypolicy.securitymap import AnnotationSecurityMap
-from zope.app.securitypolicy.securitymap import SecurityMap
-
class AnnotationRolePermissionManager(AnnotationSecurityMap):
"""Provide adapter that manages role permission data in an object attribute
"""
Modified: zope.securitypolicy/trunk/src/zope/app/securitypolicy/securitypolicy.zcml
===================================================================
--- zope.securitypolicy/trunk/src/zope/app/securitypolicy/securitypolicy.zcml 2007-09-26 14:51:44 UTC (rev 80106)
+++ zope.securitypolicy/trunk/src/zope/app/securitypolicy/securitypolicy.zcml 2007-09-26 14:58:39 UTC (rev 80107)
@@ -1,7 +1,6 @@
<configure
xmlns="http://namespaces.zope.org/zope"
- i18n_domain="zope"
- >
+ i18n_domain="zope">
<include package="zope.app.securitypolicy" />
Deleted: zope.securitypolicy/trunk/src/zope/app/securitypolicy/testing.py
===================================================================
--- zope.securitypolicy/trunk/src/zope/app/securitypolicy/testing.py 2007-09-26 14:51:44 UTC (rev 80106)
+++ zope.securitypolicy/trunk/src/zope/app/securitypolicy/testing.py 2007-09-26 14:58:39 UTC (rev 80107)
@@ -1,26 +0,0 @@
-##############################################################################
-#
-# Copyright (c) 2007 Zope Corporation and Contributors.
-# All Rights Reserved.
-#
-# This software is subject to the provisions of the Zope Public License,
-# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
-# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FOR A PARTICULAR PURPOSE.
-#
-##############################################################################
-"""zope.app.securitypolicy common test related classes/functions/objects.
-
-$Id$
-"""
-
-__docformat__ = "reStructuredText"
-
-import os
-from zope.app.testing.functional import ZCMLLayer
-
-SecurityPolicyLayer = ZCMLLayer(
- os.path.join(os.path.split(__file__)[0], 'ftesting.zcml'),
- __name__, 'SecurityPolicyLayer', allow_teardown=True)
Deleted: zope.securitypolicy/trunk/src/zope/app/securitypolicy/tests/functional.py
===================================================================
--- zope.securitypolicy/trunk/src/zope/app/securitypolicy/tests/functional.py 2007-09-26 14:51:44 UTC (rev 80106)
+++ zope.securitypolicy/trunk/src/zope/app/securitypolicy/tests/functional.py 2007-09-26 14:58:39 UTC (rev 80107)
@@ -1,38 +0,0 @@
-##############################################################################
-#
-# Copyright (c) 2004 Zope Corporation and Contributors.
-# All Rights Reserved.
-#
-# This software is subject to the provisions of the Zope Public License,
-# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
-# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FOR A PARTICULAR PURPOSE.
-#
-##############################################################################
-"""Functional test case support
-
-$Id$
-"""
-
-from zope import interface
-from zope.app.testing import functional
-
-class ManagerSetup:
- interface.implements(functional.IManagerSetup)
-
- def setUpManager(self):
- functional.HTTPCaller()(grant_request, handle_errors=False)
-
-grant_request = (r"""
-POST /@@grant.html HTTP/1.1
-Authorization: Basic Z2xvYmFsbWdyOmdsb2JhbG1ncnB3
-Content-Length: 5796
-Content-Type: application/x-www-form-urlencoded
-
-field.principal=em9wZS5tZ3I_"""
-"""&field.principal.displayed=y"""
-"""&GRANT_SUBMIT=Change"""
-"""&field.em9wZS5tZ3I_.role.zope.Manager=allow"""
-"""&field.em9wZS5tZ3I_.role.zope.Manager-empty-marker=1""")
Deleted: zope.securitypolicy/trunk/src/zope/app/securitypolicy/tests/functional.zcml
===================================================================
--- zope.securitypolicy/trunk/src/zope/app/securitypolicy/tests/functional.zcml 2007-09-26 14:51:44 UTC (rev 80106)
+++ zope.securitypolicy/trunk/src/zope/app/securitypolicy/tests/functional.zcml 2007-09-26 14:58:39 UTC (rev 80107)
@@ -1,7 +0,0 @@
-<configure
- xmlns="http://namespaces.zope.org/zope"
- >
-
- <utility factory=".functional.ManagerSetup" />
-
-</configure>
Modified: zope.securitypolicy/trunk/src/zope/app/securitypolicy/tests/mapping.zcml
===================================================================
--- zope.securitypolicy/trunk/src/zope/app/securitypolicy/tests/mapping.zcml 2007-09-26 14:51:44 UTC (rev 80106)
+++ zope.securitypolicy/trunk/src/zope/app/securitypolicy/tests/mapping.zcml 2007-09-26 14:58:39 UTC (rev 80107)
@@ -1,6 +1,6 @@
<configure xmlns="http://namespaces.zope.org/zope">
- <include package="zope.app.securitypolicy" file="meta.zcml"/>
+ <include package="zope.securitypolicy" file="meta.zcml"/>
<grant
permission="zope.Foo"
Modified: zope.securitypolicy/trunk/src/zope/app/securitypolicy/tests/role.zcml
===================================================================
--- zope.securitypolicy/trunk/src/zope/app/securitypolicy/tests/role.zcml 2007-09-26 14:51:44 UTC (rev 80106)
+++ zope.securitypolicy/trunk/src/zope/app/securitypolicy/tests/role.zcml 2007-09-26 14:58:39 UTC (rev 80107)
@@ -1,9 +1,8 @@
<configure
xmlns="http://namespaces.zope.org/zope"
- i18n_domain="zope"
- >
+ i18n_domain="zope">
- <include package="zope.app.securitypolicy" file="meta.zcml"/>
+ <include package="zope.securitypolicy" file="meta.zcml"/>
<role
id="zope.Everyperson"
Modified: zope.securitypolicy/trunk/src/zope/app/securitypolicy/tests/role_duplicate.zcml
===================================================================
--- zope.securitypolicy/trunk/src/zope/app/securitypolicy/tests/role_duplicate.zcml 2007-09-26 14:51:44 UTC (rev 80106)
+++ zope.securitypolicy/trunk/src/zope/app/securitypolicy/tests/role_duplicate.zcml 2007-09-26 14:58:39 UTC (rev 80107)
@@ -2,7 +2,7 @@
xmlns="http://namespaces.zope.org/zope"
i18n_domain="zope">
- <include package="zope.app.securitypolicy" file="meta.zcml"/>
+ <include package="zope.securitypolicy" file="meta.zcml"/>
<role
id="zope.Everyperson"
Modified: zope.securitypolicy/trunk/src/zope/app/securitypolicy/tests/test_annotationprincipalpermissionmanager.py
===================================================================
--- zope.securitypolicy/trunk/src/zope/app/securitypolicy/tests/test_annotationprincipalpermissionmanager.py 2007-09-26 14:51:44 UTC (rev 80106)
+++ zope.securitypolicy/trunk/src/zope/app/securitypolicy/tests/test_annotationprincipalpermissionmanager.py 2007-09-26 14:58:39 UTC (rev 80107)
@@ -23,14 +23,14 @@
from zope.security.interfaces import IPermission
from zope.security.permission import Permission
+from zope.securitypolicy.interfaces import Allow, Deny, Unset
+from zope.securitypolicy.principalpermission import \
+ AnnotationPrincipalPermissionManager
+
from zope.app.testing import ztapi
from zope.app.security.principalregistry import principalRegistry
from zope.app.testing.placelesssetup import PlacelessSetup
-from zope.app.securitypolicy.interfaces import Allow, Deny, Unset
-from zope.app.securitypolicy.principalpermission \
- import AnnotationPrincipalPermissionManager
-
class Manageable(object):
implements(IAttributeAnnotatable)
Modified: zope.securitypolicy/trunk/src/zope/app/securitypolicy/tests/test_annotationprincipalrolemanager.py
===================================================================
--- zope.securitypolicy/trunk/src/zope/app/securitypolicy/tests/test_annotationprincipalrolemanager.py 2007-09-26 14:51:44 UTC (rev 80106)
+++ zope.securitypolicy/trunk/src/zope/app/securitypolicy/tests/test_annotationprincipalrolemanager.py 2007-09-26 14:58:39 UTC (rev 80107)
@@ -23,10 +23,10 @@
from zope.app.security.principalregistry import principalRegistry
from zope.app.component.testing import PlacefulSetup
-from zope.app.securitypolicy.principalrole import AnnotationPrincipalRoleManager
-from zope.app.securitypolicy.interfaces import Allow, Deny
-from zope.app.securitypolicy.interfaces import IRole
-from zope.app.securitypolicy.role import Role
+from zope.securitypolicy.principalrole import AnnotationPrincipalRoleManager
+from zope.securitypolicy.interfaces import Allow, Deny
+from zope.securitypolicy.interfaces import IRole
+from zope.securitypolicy.role import Role
class Manageable(object):
implements(IAttributeAnnotatable)
Modified: zope.securitypolicy/trunk/src/zope/app/securitypolicy/tests/test_annotationrolepermissionmanager.py
===================================================================
--- zope.securitypolicy/trunk/src/zope/app/securitypolicy/tests/test_annotationrolepermissionmanager.py 2007-09-26 14:51:44 UTC (rev 80106)
+++ zope.securitypolicy/trunk/src/zope/app/securitypolicy/tests/test_annotationrolepermissionmanager.py 2007-09-26 14:58:39 UTC (rev 80107)
@@ -24,11 +24,10 @@
from zope.app.testing import ztapi
from zope.app.component.testing import PlacefulSetup
-from zope.app.securitypolicy.role import Role
-from zope.app.securitypolicy.interfaces import Allow, Deny
-from zope.app.securitypolicy.interfaces import IRole
-from zope.app.securitypolicy.rolepermission \
- import AnnotationRolePermissionManager
+from zope.securitypolicy.role import Role
+from zope.securitypolicy.interfaces import Allow, Deny
+from zope.securitypolicy.interfaces import IRole
+from zope.securitypolicy.rolepermission import AnnotationRolePermissionManager
class Manageable(object):
implements(IAttributeAnnotatable)
Modified: zope.securitypolicy/trunk/src/zope/app/securitypolicy/tests/test_principalpermissionmanager.py
===================================================================
--- zope.securitypolicy/trunk/src/zope/app/securitypolicy/tests/test_principalpermissionmanager.py 2007-09-26 14:51:44 UTC (rev 80106)
+++ zope.securitypolicy/trunk/src/zope/app/securitypolicy/tests/test_principalpermissionmanager.py 2007-09-26 14:58:39 UTC (rev 80107)
@@ -25,9 +25,9 @@
from zope.app.security.interfaces import IAuthentication
from zope.app.security.principalregistry import principalRegistry
-from zope.app.securitypolicy.interfaces import Allow, Deny, Unset
-from zope.app.securitypolicy.principalpermission \
- import principalPermissionManager as manager
+from zope.securitypolicy.interfaces import Allow, Deny, Unset
+from zope.securitypolicy.principalpermission import \
+ principalPermissionManager as manager
def definePermission(id, title=None, description=None):
Modified: zope.securitypolicy/trunk/src/zope/app/securitypolicy/tests/test_principalrolemanager.py
===================================================================
--- zope.securitypolicy/trunk/src/zope/app/securitypolicy/tests/test_principalrolemanager.py 2007-09-26 14:51:44 UTC (rev 80106)
+++ zope.securitypolicy/trunk/src/zope/app/securitypolicy/tests/test_principalrolemanager.py 2007-09-26 14:58:39 UTC (rev 80107)
@@ -23,10 +23,10 @@
from zope.app.security.interfaces import IAuthentication
from zope.app.security.principalregistry import principalRegistry
-from zope.app.securitypolicy.role import Role
-from zope.app.securitypolicy.interfaces import Allow, Deny
-from zope.app.securitypolicy.interfaces import IRole
-from zope.app.securitypolicy.principalrole import principalRoleManager
+from zope.securitypolicy.role import Role
+from zope.securitypolicy.interfaces import Allow, Deny
+from zope.securitypolicy.interfaces import IRole
+from zope.securitypolicy.principalrole import principalRoleManager
def defineRole(id, title=None, description=None):
role = Role(id, title, description)
Modified: zope.securitypolicy/trunk/src/zope/app/securitypolicy/tests/test_role.py
===================================================================
--- zope.securitypolicy/trunk/src/zope/app/securitypolicy/tests/test_role.py 2007-09-26 14:51:44 UTC (rev 80106)
+++ zope.securitypolicy/trunk/src/zope/app/securitypolicy/tests/test_role.py 2007-09-26 14:58:39 UTC (rev 80107)
@@ -21,7 +21,7 @@
def test_suite():
return unittest.TestSuite((
- DocTestSuite('zope.app.securitypolicy.role'),
+ DocTestSuite('zope.securitypolicy.role'),
))
if __name__ == '__main__':
Modified: zope.securitypolicy/trunk/src/zope/app/securitypolicy/tests/test_rolepermissionmanager.py
===================================================================
--- zope.securitypolicy/trunk/src/zope/app/securitypolicy/tests/test_rolepermissionmanager.py 2007-09-26 14:51:44 UTC (rev 80106)
+++ zope.securitypolicy/trunk/src/zope/app/securitypolicy/tests/test_rolepermissionmanager.py 2007-09-26 14:58:39 UTC (rev 80107)
@@ -22,11 +22,11 @@
from zope.app.testing.placelesssetup import PlacelessSetup
from zope.app.testing import ztapi
-from zope.app.securitypolicy.role import Role
-from zope.app.securitypolicy.interfaces import Allow, Deny
-from zope.app.securitypolicy.interfaces import IRole
-from zope.app.securitypolicy.rolepermission \
- import rolePermissionManager as manager
+from zope.securitypolicy.role import Role
+from zope.securitypolicy.interfaces import Allow, Deny
+from zope.securitypolicy.interfaces import IRole
+from zope.securitypolicy.rolepermission import \
+ rolePermissionManager as manager
def defineRole(id, title=None, description=None):
role = Role(id, title, description)
@@ -118,8 +118,8 @@
self.assertRaises(ValueError,
manager.grantPermissionToRole, perm1, 'role1'
)
-
+
def test_suite():
loader=unittest.TestLoader()
return loader.loadTestsFromTestCase(Test)
Modified: zope.securitypolicy/trunk/src/zope/app/securitypolicy/tests/test_securitydirectives.py
===================================================================
--- zope.securitypolicy/trunk/src/zope/app/securitypolicy/tests/test_securitydirectives.py 2007-09-26 14:51:44 UTC (rev 80106)
+++ zope.securitypolicy/trunk/src/zope/app/securitypolicy/tests/test_securitydirectives.py 2007-09-26 14:58:39 UTC (rev 80107)
@@ -28,16 +28,16 @@
from zope.app.security.interfaces import IAuthentication
from zope.app.security.principalregistry import principalRegistry
-from zope.app.securitypolicy.role import Role
-from zope.app.securitypolicy.interfaces import Allow
-from zope.app.securitypolicy.interfaces import IRole
-from zope.app.securitypolicy.rolepermission \
- import rolePermissionManager as role_perm_mgr
-from zope.app.securitypolicy.principalpermission \
- import principalPermissionManager as principal_perm_mgr
-from zope.app.securitypolicy.principalrole \
- import principalRoleManager as principal_role_mgr
-import zope.app.securitypolicy.tests
+from zope.securitypolicy.role import Role
+from zope.securitypolicy.interfaces import Allow
+from zope.securitypolicy.interfaces import IRole
+from zope.securitypolicy.rolepermission import \
+ rolePermissionManager as role_perm_mgr
+from zope.securitypolicy.principalpermission import \
+ principalPermissionManager as principal_perm_mgr
+from zope.securitypolicy.principalrole import \
+ principalRoleManager as principal_role_mgr
+import zope.securitypolicy.tests
def defineRole(id, title=None, description=None):
@@ -56,8 +56,7 @@
class TestRoleDirective(TestBase, unittest.TestCase):
def testRegister(self):
- context = xmlconfig.file("role.zcml",
- zope.app.securitypolicy.tests)
+ context = xmlconfig.file("role.zcml", zope.securitypolicy.tests)
role = zope.component.getUtility(IRole, "zope.Everyperson")
self.failUnless(role.id.endswith('Everyperson'))
@@ -67,8 +66,7 @@
def testDuplicationRegistration(self):
self.assertRaises(ConfigurationConflictError, xmlconfig.file,
- "role_duplicate.zcml",
- zope.app.securitypolicy.tests)
+ "role_duplicate.zcml", zope.securitypolicy.tests)
class TestSecurityMapping(TestBase, unittest.TestCase):
@@ -79,8 +77,7 @@
name='zope.Foo')
defineRole("zope.Bar", '', '')
principalRegistry.definePrincipal("zope.Blah", '', '')
- self.context = xmlconfig.file("mapping.zcml",
- zope.app.securitypolicy.tests)
+ self.context = xmlconfig.file("mapping.zcml", zope.securitypolicy.tests)
def test_PermRoleMap(self):
roles = role_perm_mgr.getRolesForPermission("zope.Foo")
Modified: zope.securitypolicy/trunk/src/zope/app/securitypolicy/tests/test_securitymap.py
===================================================================
--- zope.securitypolicy/trunk/src/zope/app/securitypolicy/tests/test_securitymap.py 2007-09-26 14:51:44 UTC (rev 80106)
+++ zope.securitypolicy/trunk/src/zope/app/securitypolicy/tests/test_securitymap.py 2007-09-26 14:58:39 UTC (rev 80107)
@@ -16,8 +16,8 @@
$Id$
"""
import unittest
-from zope.app.securitypolicy.securitymap import SecurityMap
-from zope.app.securitypolicy.securitymap import PersistentSecurityMap
+from zope.securitypolicy.securitymap import SecurityMap
+from zope.securitypolicy.securitymap import PersistentSecurityMap
from zope.security.management import setSecurityPolicy, getInteraction
from zope.security.management import newInteraction, endInteraction
Modified: zope.securitypolicy/trunk/src/zope/app/securitypolicy/tests/test_vocabulary.py
===================================================================
--- zope.securitypolicy/trunk/src/zope/app/securitypolicy/tests/test_vocabulary.py 2007-09-26 14:51:44 UTC (rev 80106)
+++ zope.securitypolicy/trunk/src/zope/app/securitypolicy/tests/test_vocabulary.py 2007-09-26 14:58:39 UTC (rev 80107)
@@ -20,7 +20,7 @@
def test_suite():
return unittest.TestSuite((
- DocTestSuite('zope.app.securitypolicy.vocabulary'),
+ DocTestSuite('zope.securitypolicy.vocabulary'),
))
if __name__ == '__main__':
Modified: zope.securitypolicy/trunk/src/zope/app/securitypolicy/tests/test_zopepolicy.py
===================================================================
--- zope.securitypolicy/trunk/src/zope/app/securitypolicy/tests/test_zopepolicy.py 2007-09-26 14:51:44 UTC (rev 80106)
+++ zope.securitypolicy/trunk/src/zope/app/securitypolicy/tests/test_zopepolicy.py 2007-09-26 14:58:39 UTC (rev 80107)
@@ -25,18 +25,18 @@
from zope.security.management import endInteraction
from zope.app.testing import placelesssetup, ztapi
-from zope.app.securitypolicy.interfaces import IGrantInfo
-from zope.app.securitypolicy.interfaces import IPrincipalRoleManager
-from zope.app.securitypolicy.interfaces import IPrincipalPermissionManager
-from zope.app.securitypolicy.interfaces import IRolePermissionManager
-from zope.app.securitypolicy.principalpermission \
- import AnnotationPrincipalPermissionManager
-from zope.app.securitypolicy.principalrole \
- import AnnotationPrincipalRoleManager
-from zope.app.securitypolicy.rolepermission \
- import AnnotationRolePermissionManager
-from zope.app.securitypolicy.grantinfo \
- import AnnotationGrantInfo
+from zope.securitypolicy.interfaces import IGrantInfo
+from zope.securitypolicy.interfaces import IPrincipalRoleManager
+from zope.securitypolicy.interfaces import IPrincipalPermissionManager
+from zope.securitypolicy.interfaces import IRolePermissionManager
+from zope.securitypolicy.principalpermission import \
+ AnnotationPrincipalPermissionManager
+from zope.securitypolicy.principalrole import \
+ AnnotationPrincipalRoleManager
+from zope.securitypolicy.rolepermission import \
+ AnnotationRolePermissionManager
+from zope.securitypolicy.grantinfo import \
+ AnnotationGrantInfo
def setUp(test):
placelesssetup.setUp()
@@ -61,8 +61,8 @@
def test_suite():
return unittest.TestSuite((
DocFileSuite('zopepolicy.txt',
- package='zope.app.securitypolicy',
- setUp=setUp, tearDown=placelesssetup.tearDown),
+ package='zope.securitypolicy',
+ setUp=setUp, tearDown=placelesssetup.tearDown),
))
if __name__ == '__main__':
Modified: zope.securitypolicy/trunk/src/zope/app/securitypolicy/vocabulary.py
===================================================================
--- zope.securitypolicy/trunk/src/zope/app/securitypolicy/vocabulary.py 2007-09-26 14:51:44 UTC (rev 80106)
+++ zope.securitypolicy/trunk/src/zope/app/securitypolicy/vocabulary.py 2007-09-26 14:58:39 UTC (rev 80107)
@@ -24,8 +24,8 @@
from zope.schema.vocabulary import SimpleTerm, SimpleVocabulary
from zope.schema.interfaces import IVocabularyFactory
-from zope.app.securitypolicy.interfaces import IRole
-from zope.app.securitypolicy.interfaces import IGrantVocabulary
+from zope.securitypolicy.interfaces import IRole
+from zope.securitypolicy.interfaces import IGrantVocabulary
class RoleIdsVocabulary(SimpleVocabulary):
@@ -44,8 +44,8 @@
Let's register some sample roles to test against them
- >>> from zope.app.securitypolicy.interfaces import IRole
- >>> from zope.app.securitypolicy.role import Role
+ >>> from zope.securitypolicy.interfaces import IRole
+ >>> from zope.securitypolicy.role import Role
>>> from zope.app.testing import ztapi
>>> ztapi.provideUtility(IRole, Role('a_id','a_title'), 'a_id')
>>> ztapi.provideUtility(IRole, Role('b_id','b_title'), 'b_id')
Modified: zope.securitypolicy/trunk/src/zope/app/securitypolicy/zopepolicy.py
===================================================================
--- zope.securitypolicy/trunk/src/zope/app/securitypolicy/zopepolicy.py 2007-09-26 14:51:44 UTC (rev 80106)
+++ zope.securitypolicy/trunk/src/zope/app/securitypolicy/zopepolicy.py 2007-09-26 14:58:39 UTC (rev 80107)
@@ -28,21 +28,20 @@
from zope.app.security.interfaces import PrincipalLookupError
-from zope.app.securitypolicy.principalpermission \
- import principalPermissionManager
+from zope.securitypolicy.principalpermission import principalPermissionManager
globalPrincipalPermissionSetting = principalPermissionManager.getSetting
-from zope.app.securitypolicy.rolepermission import rolePermissionManager
+from zope.securitypolicy.rolepermission import rolePermissionManager
globalRolesForPermission = rolePermissionManager.getRolesForPermission
-from zope.app.securitypolicy.principalrole import principalRoleManager
+from zope.securitypolicy.principalrole import principalRoleManager
globalRolesForPrincipal = principalRoleManager.getRolesForPrincipal
-from zope.app.securitypolicy.interfaces import Allow, Deny, Unset
-from zope.app.securitypolicy.interfaces import IRolePermissionMap
-from zope.app.securitypolicy.interfaces import IPrincipalPermissionMap
-from zope.app.securitypolicy.interfaces import IPrincipalRoleMap
-from zope.app.securitypolicy.interfaces import IGrantInfo
+from zope.securitypolicy.interfaces import Allow, Deny, Unset
+from zope.securitypolicy.interfaces import IRolePermissionMap
+from zope.securitypolicy.interfaces import IPrincipalPermissionMap
+from zope.securitypolicy.interfaces import IPrincipalRoleMap
+from zope.securitypolicy.interfaces import IGrantInfo
SettingAsBoolean = {Allow: True, Deny: False, Unset: None, None: None}
Modified: zope.securitypolicy/trunk/src/zope/app/securitypolicy/zopepolicy.txt
===================================================================
--- zope.securitypolicy/trunk/src/zope/app/securitypolicy/zopepolicy.txt 2007-09-26 14:51:44 UTC (rev 80106)
+++ zope.securitypolicy/trunk/src/zope/app/securitypolicy/zopepolicy.txt 2007-09-26 14:58:39 UTC (rev 80107)
@@ -39,8 +39,8 @@
The security policy provides a factory for creating interactions:
- >>> import zope.app.securitypolicy.zopepolicy
- >>> interaction = zope.app.securitypolicy.zopepolicy.ZopeSecurityPolicy()
+ >>> import zope.securitypolicy.zopepolicy
+ >>> interaction = zope.securitypolicy.zopepolicy.ZopeSecurityPolicy()
An interaction represents a specific interaction between some
principals (normally users) and the system. Normally, we are only
@@ -85,7 +85,7 @@
granting interfaces. The objects returned from the adaptation are
object-specific manager objects:
- >>> from zope.app.securitypolicy import interfaces
+ >>> from zope.securitypolicy import interfaces
>>> roleper = interfaces.IRolePermissionManager(ob)
>>> prinrole = interfaces.IPrincipalRoleManager(ob)
>>> prinper = interfaces.IPrincipalPermissionManager(ob)
@@ -101,7 +101,7 @@
>>> import zope.security.management
>>> oldpolicy = zope.security.management.setSecurityPolicy(
- ... zope.app.securitypolicy.zopepolicy.ZopeSecurityPolicy)
+ ... zope.securitypolicy.zopepolicy.ZopeSecurityPolicy)
and then we'll create a new interaction:
@@ -169,12 +169,12 @@
Grants made to an object are said to be "local". We can also make
global grants:
- >>> from zope.app.securitypolicy.rolepermission \
- ... import rolePermissionManager as roleperG
- >>> from zope.app.securitypolicy.principalpermission \
- ... import principalPermissionManager as prinperG
- >>> from zope.app.securitypolicy.principalrole \
- ... import principalRoleManager as prinroleG
+ >>> from zope.securitypolicy.rolepermission import \
+ ... rolePermissionManager as roleperG
+ >>> from zope.securitypolicy.principalpermission import \
+ ... principalPermissionManager as prinperG
+ >>> from zope.securitypolicy.principalrole import \
+ ... principalRoleManager as prinroleG
And the same rules apply to global grants and denials.
More information about the Checkins
mailing list