[Zope3-checkins] CVS: Zope3/src/zope/app/securitypolicy/browser/tests - test_principalpermissionview.py:1.3 test_principalroleview.py:1.4 test_rolepermissionview.py:1.4

[Stephan Richter]

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

Modified Files:
	test_principalpermissionview.py test_principalroleview.py 
	test_rolepermissionview.py 
Log Message:


Adjusted imports of placefulsetup and site-related objects.




=== Zope3/src/zope/app/securitypolicy/browser/tests/test_principalpermissionview.py 1.2 => 1.3 ===
--- Zope3/src/zope/app/securitypolicy/browser/tests/test_principalpermissionview.py:1.2	Mon Mar  8 07:06:06 2004
+++ Zope3/src/zope/app/securitypolicy/browser/tests/test_principalpermissionview.py	Sat Mar 13 10:21:33 2004
@@ -21,14 +21,14 @@
 
 from zope.app import zapi
 from zope.app.tests import ztapi
-from zope.app.interfaces.services.service import ISimpleService
+from zope.app.site.interfaces import ISimpleService
 from zope.app.interfaces.annotation import IAttributeAnnotatable, IAnnotations
 from zope.app.security.interfaces import IAuthenticationService, IPrincipal
 from zope.app.security.interfaces import IPermission
 from zope.app.services.servicenames import Authentication
 from zope.app.attributeannotations import AttributeAnnotations
 from zope.app.security.settings import Allow, Deny, Unset
-from zope.app.services.tests.placefulsetup import PlacefulSetup
+from zope.app.site.tests.placefulsetup import PlacefulSetup
 
 from zope.app.securitypolicy.interfaces import IPrincipalPermissionManager
 from zope.app.securitypolicy.interfaces import IPrincipalPermissionMap


=== Zope3/src/zope/app/securitypolicy/browser/tests/test_principalroleview.py 1.3 => 1.4 ===
--- Zope3/src/zope/app/securitypolicy/browser/tests/test_principalroleview.py:1.3	Mon Mar  8 07:06:06 2004
+++ Zope3/src/zope/app/securitypolicy/browser/tests/test_principalroleview.py	Sat Mar 13 10:21:33 2004
@@ -25,9 +25,9 @@
 from zope.app.security.interfaces import IAuthenticationService, IPrincipal
 from zope.app.security.interfaces import IPermission
 from zope.app.security.permission import Permission
-from zope.app.interfaces.services.service import ISimpleService
+from zope.app.site.interfaces import ISimpleService
 from zope.app.services.servicenames import Authentication
-from zope.app.services.tests.placefulsetup import PlacefulSetup
+from zope.app.site.tests.placefulsetup import PlacefulSetup
 
 from zope.app.securitypolicy.role import Role
 from zope.app.securitypolicy.interfaces import IRole


=== Zope3/src/zope/app/securitypolicy/browser/tests/test_rolepermissionview.py 1.3 => 1.4 ===
--- Zope3/src/zope/app/securitypolicy/browser/tests/test_rolepermissionview.py:1.3	Mon Mar  8 07:06:06 2004
+++ Zope3/src/zope/app/securitypolicy/browser/tests/test_rolepermissionview.py	Sat Mar 13 10:21:33 2004
@@ -21,7 +21,7 @@
 from zope.app.tests import ztapi
 from zope.app.security.permission import Permission
 from zope.app.security.interfaces import IPermission
-from zope.app.services.tests.placefulsetup import PlacefulSetup
+from zope.app.site.tests.placefulsetup import PlacefulSetup
 
 from zope.app.securitypolicy.role import Role
 from zope.app.securitypolicy.interfaces import IRole