[Zope-Checkins] CVS: Zope3/lib/python/Zope/App/Security/tests - testAttributePrincipalRoleManager.py:1.1.2.9 testAttributeRolePermissionManager.py:1.1.2.10 testPrincipalPermissionView.py:1.1.2.8 testPrincipalRegistry.py:1.1.2.9 testPrincipalRoleView.py:1.1.2.8 testRolePermissionView.py:1.1.2.7 testZSP.py:1.1.2.15

[Christian Theune]

Update of /cvs-repository/Zope3/lib/python/Zope/App/Security/tests
In directory cvs.zope.org:/tmp/cvs-serv26313/lib/python/Zope/App/Security/tests

Modified Files:
      Tag: Zope-3x-branch
	testAttributePrincipalRoleManager.py 
	testAttributeRolePermissionManager.py 
	testPrincipalPermissionView.py testPrincipalRegistry.py 
	testPrincipalRoleView.py testRolePermissionView.py testZSP.py 
Log Message:
Merged the ctheune-services_move-branch to Zope-3x-branch

- Moved Zope.App.OFS.ServiceManager into the Zope.App.OFS.Services package
- Moved Zope.App.OFS.RoleService into the Zope.App.OFS.Services package



=== Zope3/lib/python/Zope/App/Security/tests/testAttributePrincipalRoleManager.py 1.1.2.8 => 1.1.2.9 ===
         import AttributePrincipalRoleManager
 from Zope.App.Security.Settings import Assign, Remove
-from Zope.App.OFS.ServiceManager.tests.PlacefulSetup import PlacefulSetup
+from Zope.App.OFS.Services.ServiceManager.tests.PlacefulSetup import PlacefulSetup
 
 class Manageable:
     __implements__ = IAttributeMementoStorable


=== Zope3/lib/python/Zope/App/Security/tests/testAttributeRolePermissionManager.py 1.1.2.9 => 1.1.2.10 ===
 from Zope.App.Security.PermissionRegistry import permissionRegistry
 from Zope.App.Security.Settings import Allow, Deny
-from Zope.App.OFS.ServiceManager.tests.PlacefulSetup \
+from Zope.App.OFS.Services.ServiceManager.tests.PlacefulSetup \
     import PlacefulSetup
 
 import unittest, sys


=== Zope3/lib/python/Zope/App/Security/tests/testPrincipalPermissionView.py 1.1.2.7 => 1.1.2.8 ===
 from Zope.App.Security.IPrincipalPermissionMap import IPrincipalPermissionMap
 from Zope.App.Security.Settings import Allow, Deny, Unset
-from Zope.App.OFS.ServiceManager.tests.PlacefulSetup \
+from Zope.App.OFS.Services.ServiceManager.tests.PlacefulSetup \
      import PlacefulSetup
 
 class DummyContext:


=== Zope3/lib/python/Zope/App/Security/tests/testPrincipalRegistry.py 1.1.2.8 => 1.1.2.9 ===
 from Zope.Exceptions import NotFoundError
 from Zope.Publisher.HTTP.IHTTPCredentials import IHTTPCredentials
-from Zope.App.OFS.ServiceManager.tests.PlacefulSetup \
+from Zope.App.OFS.Services.ServiceManager.tests.PlacefulSetup \
            import PlacefulSetup
 
 class Request:


=== Zope3/lib/python/Zope/App/Security/tests/testPrincipalRoleView.py 1.1.2.7 => 1.1.2.8 ===
 import unittest
 
-from Zope.App.OFS.ServiceManager.tests.PlacefulSetup\
+from Zope.App.OFS.Services.ServiceManager.tests.PlacefulSetup\
            import PlacefulSetup
 from Zope.ComponentArchitecture import getServiceManager
 


=== Zope3/lib/python/Zope/App/Security/tests/testRolePermissionView.py 1.1.2.6 => 1.1.2.7 ===
 ##############################################################################
 import unittest, sys
-from Zope.App.OFS.ServiceManager.tests.PlacefulSetup\
+from Zope.App.OFS.Services.ServiceManager.tests.PlacefulSetup\
            import PlacefulSetup
 from Zope.ComponentArchitecture import getServiceManager
 from Zope.App.Security.IRoleService import IRoleService


=== Zope3/lib/python/Zope/App/Security/tests/testZSP.py 1.1.2.14 => 1.1.2.15 ===
 from Zope.App.OFS.Memento.IMementoBag import IMementoBag
 from Zope.App.OFS.Memento.AttributeMementoBag import AttributeMementoBag
-from Zope.App.OFS.ServiceManager.tests.PlacefulSetup\
+from Zope.App.OFS.Services.ServiceManager.tests.PlacefulSetup\
            import PlacefulSetup
 
 class Context: