[Zope3-checkins] CVS: Zope3/src/zope/app/security/tests - test_securitydirectives.py:1.1.2.2 test_zsp.py:1.1.2.2

[Jim Fulton]

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

Modified Files:
      Tag: NameGeddon-branch
	test_securitydirectives.py test_zsp.py 
Log Message:
changes to get zope.component tests to almost pass

=== Zope3/src/zope/app/security/tests/test_securitydirectives.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/security/tests/test_securitydirectives.py:1.1.2.1	Mon Dec 23 14:32:21 2002
+++ Zope3/src/zope/app/security/tests/test_securitydirectives.py	Mon Dec 23 17:22:41 2002
@@ -30,11 +30,11 @@
 from zope.app.security.registries.permissionregistry \
         import permissionRegistry as pregistry
 from zope.app.security.registries.roleregistry import roleRegistry as rregistry
-from zope.app.security.grants.global.rolepermissionmanager \
+from zope.app.security.grants.rolepermissionmanager \
         import rolePermissionManager as role_perm_mgr
-from zope.app.security.grants.global.principalpermissionmanager \
+from zope.app.security.grants.principalpermissionmanager \
     import principalPermissionManager as principal_perm_mgr
-from zope.app.security.grants.global.principalrolemanager \
+from zope.app.security.grants.principalrolemanager \
     import principalRoleManager as principal_role_mgr
 
 


=== Zope3/src/zope/app/security/tests/test_zsp.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/security/tests/test_zsp.py:1.1.2.1	Mon Dec 23 14:32:21 2002
+++ Zope3/src/zope/app/security/tests/test_zsp.py	Mon Dec 23 17:22:41 2002
@@ -25,11 +25,11 @@
 from zope.app.security.registries.permissionregistry import permissionRegistry 
 from zope.app.security.registries.principalregistry import principalRegistry 
 from zope.app.security.registries.roleregistry import roleRegistry
-from zope.app.security.grants.global.principalpermissionmanager \
+from zope.app.security.grants.principalpermissionmanager \
      import principalPermissionManager 
-from zope.app.security.grants.global.rolepermissionmanager \
+from zope.app.security.grants.rolepermissionmanager \
      import rolePermissionManager 
-from zope.app.security.grants.global.principalrolemanager \
+from zope.app.security.grants.principalrolemanager \
      import principalRoleManager 
 from zope.app.security.grants.annotationprincipalpermissionmanager \
     import AnnotationPrincipalPermissionManager