[Zope3-checkins] CVS: Zope3/src/zope/app/security - zopepolicy.py:1.11.24.1

[Jim Fulton]

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

Modified Files:
      Tag: parentgeddon-branch
	zopepolicy.py 
Log Message:
got more tests to pass on branch

=== Zope3/src/zope/app/security/zopepolicy.py 1.11 => 1.11.24.1 ===
--- Zope3/src/zope/app/security/zopepolicy.py:1.11	Tue Jun  3 11:45:10 2003
+++ Zope3/src/zope/app/security/zopepolicy.py	Tue Sep  9 14:08:19 2003
@@ -18,7 +18,7 @@
 __version__='$Revision$'[11:-2]
 
 from zope.component import queryAdapter
-from zope.context import ContainmentIterator
+from zope.app.location import LocationIterator
 
 from zope.security.interfaces import ISecurityPolicy
 from zope.security.management import system_user
@@ -148,7 +148,7 @@
                 return True
 
         # Look for placeful grants
-        for place in ContainmentIterator(object):
+        for place in LocationIterator(object):
 
             # Copy specific principal permissions
             prinper = queryAdapter(place, IPrincipalPermissionMap)
@@ -244,7 +244,7 @@
             roles[role] = setting
 
     # get placeful principal permissions and roles
-    for place in ContainmentIterator(object):
+    for place in LocationIterator(object):
 
         # Copy specific principal permissions
         prinper = queryAdapter(place, IPrincipalPermissionMap)
@@ -268,7 +268,7 @@
         if role in roles and perm not in permissions:
             permissions[perm] = setting
 
-    for place in ContainmentIterator(object):
+    for place in LocationIterator(object):
 
         # Collect role permissions
         roleper = queryAdapter(place, IRolePermissionMap)