[Zope3-checkins] CVS: Zope3/src/zope/app/securitypolicy/tests - test_annotationprincipalpermissionmanager.py:1.4 test_annotationprincipalrolemanager.py:1.5 test_annotationrolepermissionmanager.py:1.5 test_zopepolicy.py:1.5

[Stephan Richter]

Update of /cvs-repository/Zope3/src/zope/app/securitypolicy/tests
In directory cvs.zope.org:/tmp/cvs-serv24548/src/zope/app/securitypolicy/tests

Modified Files:
	test_annotationprincipalpermissionmanager.py 
	test_annotationprincipalrolemanager.py 
	test_annotationrolepermissionmanager.py test_zopepolicy.py 
Log Message:


Created annotation package in zope.app.



Moved annotation interfaces to zope.app.annotation.interfaces.



Moved attributeannotations to zope.app.annotation.attribute.


=== Zope3/src/zope/app/securitypolicy/tests/test_annotationprincipalpermissionmanager.py 1.3 => 1.4 ===
--- Zope3/src/zope/app/securitypolicy/tests/test_annotationprincipalpermissionmanager.py:1.3	Mon Mar  8 07:06:09 2004
+++ Zope3/src/zope/app/securitypolicy/tests/test_annotationprincipalpermissionmanager.py	Sat Mar 13 18:01:09 2004
@@ -20,8 +20,8 @@
 from zope.interface import implements
 
 from zope.app.tests import ztapi
-from zope.app.attributeannotations import AttributeAnnotations
-from zope.app.interfaces.annotation import IAttributeAnnotatable, IAnnotations
+from zope.app.annotation.attribute import AttributeAnnotations
+from zope.app.annotation.interfaces import IAttributeAnnotatable, IAnnotations
 from zope.app.security.principalregistry import principalRegistry
 from zope.app.security.settings import Allow, Deny, Unset
 from zope.app.tests.placelesssetup import PlacelessSetup


=== Zope3/src/zope/app/securitypolicy/tests/test_annotationprincipalrolemanager.py 1.4 => 1.5 ===
--- Zope3/src/zope/app/securitypolicy/tests/test_annotationprincipalrolemanager.py:1.4	Sat Mar 13 10:21:33 2004
+++ Zope3/src/zope/app/securitypolicy/tests/test_annotationprincipalrolemanager.py	Sat Mar 13 18:01:09 2004
@@ -20,8 +20,8 @@
 
 from zope.app import zapi
 from zope.app.tests import ztapi
-from zope.app.attributeannotations import AttributeAnnotations
-from zope.app.interfaces.annotation import IAttributeAnnotatable, IAnnotations
+from zope.app.annotation.attribute import AttributeAnnotations
+from zope.app.annotation.interfaces import IAttributeAnnotatable, IAnnotations
 from zope.app.security.principalregistry import principalRegistry
 from zope.app.security.settings import Allow, Deny
 from zope.app.site.tests.placefulsetup import PlacefulSetup


=== Zope3/src/zope/app/securitypolicy/tests/test_annotationrolepermissionmanager.py 1.4 => 1.5 ===
--- Zope3/src/zope/app/securitypolicy/tests/test_annotationrolepermissionmanager.py:1.4	Sat Mar 13 10:21:33 2004
+++ Zope3/src/zope/app/securitypolicy/tests/test_annotationrolepermissionmanager.py	Sat Mar 13 18:01:09 2004
@@ -19,8 +19,8 @@
 from zope.interface import implements
 
 from zope.app.tests import ztapi
-from zope.app.attributeannotations import AttributeAnnotations
-from zope.app.interfaces.annotation import IAttributeAnnotatable, IAnnotations
+from zope.app.annotation.attribute import AttributeAnnotations
+from zope.app.annotation.interfaces import IAttributeAnnotatable, IAnnotations
 from zope.app.security.interfaces import IPermission
 from zope.app.security.permission import Permission
 from zope.app.security.settings import Allow, Deny


=== Zope3/src/zope/app/securitypolicy/tests/test_zopepolicy.py 1.4 => 1.5 ===
--- Zope3/src/zope/app/securitypolicy/tests/test_zopepolicy.py:1.4	Sat Mar 13 10:21:33 2004
+++ Zope3/src/zope/app/securitypolicy/tests/test_zopepolicy.py	Sat Mar 13 18:01:09 2004
@@ -19,8 +19,8 @@
 from zope.interface import implements
 
 from zope.app import zapi
-from zope.app.attributeannotations import AttributeAnnotations
-from zope.app.interfaces.annotation import IAttributeAnnotatable, IAnnotations
+from zope.app.annotation.attribute import AttributeAnnotations
+from zope.app.annotation.interfaces import IAttributeAnnotatable, IAnnotations
 from zope.app.security.principalregistry import principalRegistry, PrincipalBase
 from zope.app.security.interfaces import IPermission, IAuthenticationService
 from zope.app.security.permission import Permission