[Zope-Checkins] CVS: Zope3/lib/python/Zope/App/Security/tests - testPrincipalPermissionView.py:1.1.2.11

[Jim Fulton]

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

Modified Files:
      Tag: Zope-3x-branch
	testPrincipalPermissionView.py 
Log Message:
Implemented 

http://dev.zope.org/Wikis/DevSite/Projects/ComponentArchitecture/IContainerPythonification

Along the way:

- Converted most uses of has_key to use in.

- Fixed a bug in Interface names and namesAndDescriptions methods 
  that caused base class attributes to be missed.



=== Zope3/lib/python/Zope/App/Security/tests/testPrincipalPermissionView.py 1.1.2.10 => 1.1.2.11 ===
         
     def grantPermissionToPrincipal(self, permission, principal):
-        if not self._context.principals.has_key(principal):
+        if not (principal in self._context.principals):
             self._context.principals[principal]={}
             
         self._context.principals[principal][permission]=Allow
 
     def denyPermissionToPrincipal(self, permission, principal):
-        if not self._context.principals.has_key(principal):
+        if not (principal in self._context.principals):
             self._context.principals[principal]={}
             
         self._context.principals[principal][permission]=Deny
 
     def unsetPermissionForPrincipal(self, permission, principal):
-        if not self._context.principals.has_key(principal):
+        if not (principal in self._context.principals):
             return
         try:
             del self._context.principals[principal][permission]
@@ -107,7 +107,7 @@
     def getPrincipalsForPermission(self, permission):
         ret = []
         for principal, permissions in self._context.principals.items():
-            if permissions.has_key(permission):
+            if permissions in permissions:
                 ret.append((principal, permissions[permission]))
         return ret