[Checkins] SVN: z3c.objectpolicy/trunk/ - fixed tests to run with current package versions by using:
Michael Howitz
mh at gocept.com
Wed Aug 4 02:41:44 EDT 2010
Log message for revision 115421:
- fixed tests to run with current package versions by using:
zope.securitypolicy instead of zope.app.securitypolicy
zope.container instead of zope.app.container
- fixed install and test requirements accordingly
Changed:
U z3c.objectpolicy/trunk/CHANGES.txt
U z3c.objectpolicy/trunk/setup.py
U z3c.objectpolicy/trunk/src/z3c/objectpolicy/highlevel.txt
U z3c.objectpolicy/trunk/src/z3c/objectpolicy/lowlevel.txt
U z3c.objectpolicy/trunk/src/z3c/objectpolicy/objectpolicy.py
U z3c.objectpolicy/trunk/src/z3c/objectpolicy/tests.py
U z3c.objectpolicy/trunk/src/z3c/objectpolicy/zopepolicy_copy.txt
U z3c.objectpolicy/trunk/src/z3c/objectpolicy/zopepolicy_objectpolicy.txt
-=-
Modified: z3c.objectpolicy/trunk/CHANGES.txt
===================================================================
--- z3c.objectpolicy/trunk/CHANGES.txt 2010-08-04 02:40:26 UTC (rev 115420)
+++ z3c.objectpolicy/trunk/CHANGES.txt 2010-08-04 06:41:43 UTC (rev 115421)
@@ -3,6 +3,6 @@
=======
0.1.0 (unreleased)
------------------
+------------------
-- ...
+- Initial release.
\ No newline at end of file
Modified: z3c.objectpolicy/trunk/setup.py
===================================================================
--- z3c.objectpolicy/trunk/setup.py 2010-08-04 02:40:26 UTC (rev 115420)
+++ z3c.objectpolicy/trunk/setup.py 2010-08-04 06:41:43 UTC (rev 115421)
@@ -52,7 +52,6 @@
extras_require = dict(
test = [
'z3c.coverage',
- 'zope.app.securitypolicy',
'zope.app.testing',
'zope.configuration',
'zope.testing',
@@ -62,7 +61,8 @@
'setuptools',
'zope.component',
'zope.interface',
- 'zope.app.securitypolicy',
+ 'zope.securitypolicy',
+ 'zope.app.security',
],
zip_safe = False,
-)
\ No newline at end of file
+)
Modified: z3c.objectpolicy/trunk/src/z3c/objectpolicy/highlevel.txt
===================================================================
--- z3c.objectpolicy/trunk/src/z3c/objectpolicy/highlevel.txt 2010-08-04 02:40:26 UTC (rev 115420)
+++ z3c.objectpolicy/trunk/src/z3c/objectpolicy/highlevel.txt 2010-08-04 06:41:43 UTC (rev 115421)
@@ -7,8 +7,8 @@
>>> from zope import interface, component
>>> from zope.annotation.interfaces import IAttributeAnnotatable
- >>> from zope.app.container.interfaces import IContained
- >>> from zope.app.container.contained import Contained
+ >>> from zope.container.interfaces import IContained
+ >>> from zope.container.contained import Contained
>>> from z3c.objectpolicy.interfaces import IObjectPolicy
>>> from z3c.objectpolicy.interfaces import IObjectPolicyMarker
>>> class IPerson(interface.Interface):
@@ -53,7 +53,7 @@
... def __init__(self, context):
... #context is a Person
... self.context = context
- ...
+ ...
... def checkPermission(self, manager, permissionid):
... #print permissionid, str(self.context)
... return self.checkPermissionForParticipation(manager, permissionid)
@@ -71,7 +71,7 @@
... #return the Z3 default permissions
... return super(PersonPolicy, self).checkPermissionForParticipant(
... manager, principal, permissionid)
- ...
+ ...
>>> component.provideAdapter(PersonPolicy)
Install the ObjectPolicy, setup for testing.
@@ -79,13 +79,13 @@
>>> from z3c.objectpolicy.objectpolicy import ObjectPrincipalPermissionManager
>>> from z3c.objectpolicy.objectpolicy import ObjectRolePermissionManager
>>> from z3c.objectpolicy.objectpolicy import ObjectPolicy
-
+
>>> component.provideAdapter(ObjectPrincipalPermissionManager)
>>> component.provideAdapter(ObjectRolePermissionManager)
>>> bela = Person('b-id', 'bela')
>>> joe = Person('j-id', 'joe')
-
+
>>> class Participation:
... interaction = None
>>> participation = Participation()
@@ -121,7 +121,7 @@
>>> TRIP_WIRE
3
- >>> from zope.app.securitypolicy.interfaces import IPrincipalPermissionManager
+ >>> from zope.securitypolicy.interfaces import IPrincipalPermissionManager
>>> prinperBela = IPrincipalPermissionManager(bela)
>>> prinperJoe = IPrincipalPermissionManager(joe)
>>> prinperBela.grantPermissionToPrincipal('zope.ManageContent', 'j-id')
@@ -151,7 +151,7 @@
False
>>> TRIP_WIRE
5
-
+
>>> prinperOther.grantPermissionToPrincipal('zope.ManageContent', 'j-id')
>>> interaction.checkPermission('zope.ManageContent', otherObject)
True
@@ -177,7 +177,7 @@
Now a more complicated, parent-child setup
------------------------------------------
- >>> from zope.app.container.sample import SampleContainer
+ >>> from zope.container.sample import SampleContainer
>>> from zope.location.location import locate
>>> class IPersonContainer(interface.Interface):
... """a person container interface"""
@@ -189,7 +189,7 @@
... def __init__(self, id):
... self.id = id
... super(PersonContainer, self).__init__()
- ...
+ ...
>>> class BrowserView(object):
... interface.implements(
... IContained)
@@ -209,7 +209,7 @@
>>> jane = Person('jane-id','jane')
>>> users['jane'] = jane
>>> locate(jane, users, 'jane')
-
+
>>> editJack = BrowserView()
>>> locate(editJack, jack, None)
>>> editJane = BrowserView()
@@ -218,7 +218,7 @@
>>> prinperUsers = IPrincipalPermissionManager(users)
>>> prinperJack = IPrincipalPermissionManager(jack)
>>> prinperJane = IPrincipalPermissionManager(jane)
-
+
>>> participation = Participation()
The principal acting is jack
Modified: z3c.objectpolicy/trunk/src/z3c/objectpolicy/lowlevel.txt
===================================================================
--- z3c.objectpolicy/trunk/src/z3c/objectpolicy/lowlevel.txt 2010-08-04 02:40:26 UTC (rev 115420)
+++ z3c.objectpolicy/trunk/src/z3c/objectpolicy/lowlevel.txt 2010-08-04 06:41:43 UTC (rev 115421)
@@ -7,8 +7,8 @@
>>> from zope import interface, component
>>> from zope.annotation.interfaces import IAttributeAnnotatable
- >>> from zope.app.container.interfaces import IContained
- >>> from zope.app.container.contained import Contained
+ >>> from zope.container.interfaces import IContained
+ >>> from zope.container.contained import Contained
>>> from z3c.objectpolicy.interfaces import IObjectPolicy
>>> from z3c.objectpolicy.interfaces import IObjectPolicyMarker
>>> class IPerson(interface.Interface):
@@ -44,7 +44,7 @@
This is the custom policy adapter which determines the permission.
- >>> from zope.app.securitypolicy.interfaces import Allow, Deny, Unset
+ >>> from zope.securitypolicy.interfaces import Allow, Deny, Unset
>>> from z3c.objectpolicy.objectpolicy import DefaultObjectPolicyAdapter
>>> class PersonPolicy(DefaultObjectPolicyAdapter):
... component.adapts(IPerson)
@@ -67,26 +67,26 @@
... #return the Z3 default permissions
... return super(PersonPolicy, self).getPrincipalPermission(
... manager, permissionid, principalid, default)
- ...
+ ...
>>> component.provideAdapter(PersonPolicy)
Install the ObjectPolicy, setup for testing.
>>> from z3c.objectpolicy.objectpolicy import ObjectPrincipalPermissionManager
>>> from z3c.objectpolicy.objectpolicy import ObjectRolePermissionManager
-
+
>>> component.provideAdapter(ObjectPrincipalPermissionManager)
>>> component.provideAdapter(ObjectRolePermissionManager)
>>> bela = Person('b-id', 'bela')
>>> joe = Person('j-id', 'joe')
-
+
>>> class Participation:
... interaction = None
>>> participation = Participation()
>>> participation.principal = joe
>>> import zope.security.management
- >>> from zope.app.securitypolicy.zopepolicy import ZopeSecurityPolicy
+ >>> from zope.securitypolicy.zopepolicy import ZopeSecurityPolicy
>>> oldPolicy = zope.security.management.setSecurityPolicy(ZopeSecurityPolicy)
>>> zope.security.management.endInteraction()
>>> zope.security.management.newInteraction(participation)
@@ -117,7 +117,7 @@
>>> TRIP_WIRE
3
- >>> from zope.app.securitypolicy.interfaces import IPrincipalPermissionManager
+ >>> from zope.securitypolicy.interfaces import IPrincipalPermissionManager
>>> prinperBela = IPrincipalPermissionManager(bela)
>>> prinperJoe = IPrincipalPermissionManager(joe)
>>> prinperBela.grantPermissionToPrincipal('zope.ManageContent', 'j-id')
@@ -147,7 +147,7 @@
False
>>> TRIP_WIRE
5
-
+
>>> prinperOther.grantPermissionToPrincipal('zope.ManageContent', 'j-id')
>>> interaction.checkPermission('zope.ManageContent', otherObject)
True
@@ -173,7 +173,7 @@
Now a more complicated, parent-child setup
------------------------------------------
- >>> from zope.app.container.sample import SampleContainer
+ >>> from zope.container.sample import SampleContainer
>>> from zope.location.location import locate
>>> class IPersonContainer(interface.Interface):
... """a person container interface"""
@@ -185,7 +185,7 @@
... def __init__(self, id):
... self.id = id
... super(PersonContainer, self).__init__()
- ...
+ ...
>>> class BrowserView(object):
... interface.implements(
... IContained)
@@ -205,7 +205,7 @@
>>> jane = Person('jane-id','jane')
>>> users['jane'] = jane
>>> locate(jane, users, 'jane')
-
+
>>> editJack = BrowserView()
>>> locate(editJack, jack, None)
>>> editJane = BrowserView()
@@ -214,7 +214,7 @@
>>> prinperUsers = IPrincipalPermissionManager(users)
>>> prinperJack = IPrincipalPermissionManager(jack)
>>> prinperJane = IPrincipalPermissionManager(jane)
-
+
>>> participation = Participation()
The principal acting is jack
Modified: z3c.objectpolicy/trunk/src/z3c/objectpolicy/objectpolicy.py
===================================================================
--- z3c.objectpolicy/trunk/src/z3c/objectpolicy/objectpolicy.py 2010-08-04 02:40:26 UTC (rev 115420)
+++ z3c.objectpolicy/trunk/src/z3c/objectpolicy/objectpolicy.py 2010-08-04 06:41:43 UTC (rev 115421)
@@ -13,7 +13,7 @@
##############################################################################
"""
The objectpolicy package makes it easy to override the default
-zope.app.securitypolicy.zopepolicy on an object by object basis.
+zope.securitypolicy.zopepolicy on an object by object basis.
By default all objects use the zopepolicy. Objects that want to have
their own policy should have a marker interface `IObjectPolicyMarker`
@@ -24,7 +24,7 @@
import zope.interface
import zope.component
-from zope.app.securitypolicy.zopepolicy import ZopeSecurityPolicy
+from zope.securitypolicy.zopepolicy import ZopeSecurityPolicy
from zope.security.checker import CheckerPublic
from zope.security.proxy import removeSecurityProxy
from zope.security.management import system_user
@@ -32,13 +32,14 @@
from z3c.objectpolicy.interfaces import IObjectPolicyMarker
from z3c.objectpolicy.interfaces import IObjectPolicy
-from zope.app.securitypolicy.interfaces import Allow, Deny, Unset
+from zope.securitypolicy.interfaces import Allow, Deny, Unset
-from zope.app.securitypolicy.interfaces import IPrincipalPermissionManager
-from zope.app.securitypolicy.principalpermission import AnnotationPrincipalPermissionManager
-from zope.app.securitypolicy.interfaces import IRolePermissionManager
-from zope.app.securitypolicy.rolepermission import AnnotationRolePermissionManager
+from zope.securitypolicy.interfaces import IPrincipalPermissionManager
+from zope.securitypolicy.principalpermission import AnnotationPrincipalPermissionManager
+from zope.securitypolicy.interfaces import IRolePermissionManager
+from zope.securitypolicy.rolepermission import AnnotationRolePermissionManager
+
class ObjectPolicy(ZopeSecurityPolicy):
def checkZopePermission(self, permission, object):
Modified: z3c.objectpolicy/trunk/src/z3c/objectpolicy/tests.py
===================================================================
--- z3c.objectpolicy/trunk/src/z3c/objectpolicy/tests.py 2010-08-04 02:40:26 UTC (rev 115420)
+++ z3c.objectpolicy/trunk/src/z3c/objectpolicy/tests.py 2010-08-04 06:41:43 UTC (rev 115421)
@@ -16,7 +16,7 @@
from zope.app.testing import placelesssetup
from zope.configuration import xmlconfig
from zope.testing import module
-from zope.app.securitypolicy.tests.test_zopepolicy import setUp
+from zope.securitypolicy.tests.test_zopepolicy import setUp
from z3c.objectpolicy.objectpolicy import ObjectPrincipalPermissionManager
from z3c.objectpolicy.objectpolicy import ObjectRolePermissionManager
@@ -50,6 +50,3 @@
setUp=setUpOP, tearDown=tearDown,
),
))
-
-if __name__ == '__main__':
- unittest.main(defaultTest='test_suite')
Modified: z3c.objectpolicy/trunk/src/z3c/objectpolicy/zopepolicy_copy.txt
===================================================================
--- z3c.objectpolicy/trunk/src/z3c/objectpolicy/zopepolicy_copy.txt 2010-08-04 02:40:26 UTC (rev 115420)
+++ z3c.objectpolicy/trunk/src/z3c/objectpolicy/zopepolicy_copy.txt 2010-08-04 06:41:43 UTC (rev 115421)
@@ -1,4 +1,4 @@
-THIS IS A COPY of zope.app.securitypolicy.zopepolicy.txt
+THIS IS A COPY of zope.securitypolicy.zopepolicy.txt
Because all test there have to pass with the objectpolicy installed.
Classic Zope Security Policy
@@ -42,8 +42,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,10 +85,10 @@
True
We make grants and denials on objects by adapting them to various
-granting interfaces. The objects returned from the adaptation are
+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)
@@ -104,7 +104,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:
@@ -172,11 +172,11 @@
Grants made to an object are said to be "local". We can also make
global grants:
- >>> from zope.app.securitypolicy.rolepermission \
+ >>> from zope.securitypolicy.rolepermission \
... import rolePermissionManager as roleperG
- >>> from zope.app.securitypolicy.principalpermission \
+ >>> from zope.securitypolicy.principalpermission \
... import principalPermissionManager as prinperG
- >>> from zope.app.securitypolicy.principalrole \
+ >>> from zope.securitypolicy.principalrole \
... import principalRoleManager as prinroleG
And the same rules apply to global grants and denials.
@@ -510,7 +510,6 @@
>>> from zope.app.testing import ztapi
>>> ztapi.provideUtility(IAuthentication, auth)
- >>> from zope.app import zapi
Let's define a group:
Modified: z3c.objectpolicy/trunk/src/z3c/objectpolicy/zopepolicy_objectpolicy.txt
===================================================================
--- z3c.objectpolicy/trunk/src/z3c/objectpolicy/zopepolicy_objectpolicy.txt 2010-08-04 02:40:26 UTC (rev 115420)
+++ z3c.objectpolicy/trunk/src/z3c/objectpolicy/zopepolicy_objectpolicy.txt 2010-08-04 06:41:43 UTC (rev 115421)
@@ -1,4 +1,4 @@
-THIS IS A COPY of zope.app.securitypolicy.zopepolicy.txt
+THIS IS A COPY of zope.securitypolicy.zopepolicy.txt
Because all test there have to pass with the objectpolicy installed.
This one uses ObjectPolicy as the security policy.
@@ -44,7 +44,7 @@
The security policy provides a factory for creating interactions:
- >>> import zope.app.securitypolicy.zopepolicy
+ >>> import zope.securitypolicy.zopepolicy
>>> import z3c.objectpolicy.objectpolicy
>>> interaction = z3c.objectpolicy.objectpolicy.ObjectPolicy()
@@ -88,10 +88,10 @@
True
We make grants and denials on objects by adapting them to various
-granting interfaces. The objects returned from the adaptation are
+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)
@@ -175,11 +175,11 @@
Grants made to an object are said to be "local". We can also make
global grants:
- >>> from zope.app.securitypolicy.rolepermission \
+ >>> from zope.securitypolicy.rolepermission \
... import rolePermissionManager as roleperG
- >>> from zope.app.securitypolicy.principalpermission \
+ >>> from zope.securitypolicy.principalpermission \
... import principalPermissionManager as prinperG
- >>> from zope.app.securitypolicy.principalrole \
+ >>> from zope.securitypolicy.principalrole \
... import principalRoleManager as prinroleG
And the same rules apply to global grants and denials.
@@ -513,7 +513,6 @@
>>> from zope.app.testing import ztapi
>>> ztapi.provideUtility(IAuthentication, auth)
- >>> from zope.app import zapi
Let's define a group:
More information about the checkins
mailing list