[Zope3-checkins] CVS: Zope3/src/zope/app/security/grants - annotationprincipalpermissionmanager.py:1.1.2.3 annotationprincipalrolemanager.py:1.1.2.3 annotationrolepermissionmanager.py:1.1.2.3 metaconfigure.py:1.1.2.2 permissionroles.py:1.1.2.2 persistentlocalsecuritymap.py:1.1.2.2 principalpermissionmanager.py:1.1.2.2 principalrolemanager.py:1.1.2.2 rolepermissionmanager.py:1.1.2.3 rolepermissions.py:1.1.2.2

Tim Peters tim.one@comcast.net
Tue, 24 Dec 2002 21:21:47 -0500


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

Modified Files:
      Tag: NameGeddon-branch
	annotationprincipalpermissionmanager.py 
	annotationprincipalrolemanager.py 
	annotationrolepermissionmanager.py metaconfigure.py 
	permissionroles.py persistentlocalsecuritymap.py 
	principalpermissionmanager.py principalrolemanager.py 
	rolepermissionmanager.py rolepermissions.py 
Log Message:
Whitespace normalization, via Python's Tools/scripts/reindent.py.  The
files are fixed-points of that script now.  Fixed a few cases where
code relied on significant trailing whitespace (ouch).


=== Zope3/src/zope/app/security/grants/annotationprincipalpermissionmanager.py 1.1.2.2 => 1.1.2.3 ===
--- Zope3/src/zope/app/security/grants/annotationprincipalpermissionmanager.py:1.1.2.2	Tue Dec 24 07:51:16 2002
+++ Zope3/src/zope/app/security/grants/annotationprincipalpermissionmanager.py	Tue Dec 24 21:20:46 2002
@@ -2,14 +2,14 @@
 #
 # Copyright (c) 2001, 2002 Zope Corporation and Contributors.
 # All Rights Reserved.
-# 
+#
 # This software is subject to the provisions of the Zope Public License,
 # Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
 # THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
 # WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
 # FOR A PARTICULAR PURPOSE.
-# 
+#
 ##############################################################################
 """Mappings between principals and permissions, stored in an object locally."""
 
@@ -53,28 +53,28 @@
     def getPrincipalsForPermission(self, permission_id):
         ''' See the interface IPrincipalPermissionManager '''
         pp = self._getPrincipalPermissions()
-        if pp: 
+        if pp:
             return pp.getRow(permission_id)
         return []
 
     def getPermissionsForPrincipal(self, principal_id):
         ''' See the interface IPrincipalPermissionManager '''
         pp = self._getPrincipalPermissions()
-        if pp: 
+        if pp:
             return pp.getCol(principal_id)
         return []
 
     def getSetting(self, permission_id, principal_id):
         ''' See the interface IPrincipalPermissionManager '''
         pp = self._getPrincipalPermissions()
-        if pp: 
+        if pp:
             return pp.getCell(permission_id, principal_id, default=Unset)
         return []
 
     def getPrincipalsAndPermissions(self):
         ''' See the interface IPrincipalPermissionManager '''
         pp = self._getPrincipalPermissions()
-        if pp: 
+        if pp:
             return pp.getAllCells()
         return []
 


=== Zope3/src/zope/app/security/grants/annotationprincipalrolemanager.py 1.1.2.2 => 1.1.2.3 ===
--- Zope3/src/zope/app/security/grants/annotationprincipalrolemanager.py:1.1.2.2	Tue Dec 24 07:51:16 2002
+++ Zope3/src/zope/app/security/grants/annotationprincipalrolemanager.py	Tue Dec 24 21:20:46 2002
@@ -2,14 +2,14 @@
 #
 # Copyright (c) 2001, 2002 Zope Corporation and Contributors.
 # All Rights Reserved.
-# 
+#
 # This software is subject to the provisions of the Zope Public License,
 # Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
 # THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
 # WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
 # FOR A PARTICULAR PURPOSE.
-# 
+#
 ##############################################################################
 """Mappings between principals and roles, stored in an object locally."""
 
@@ -51,21 +51,21 @@
     def getPrincipalsForRole(self, role_id):
         ''' See the interface IPrincipalRoleManager '''
         pp = self._getPrincipalRoles()
-        if pp: 
+        if pp:
             return pp.getRow(role_id)
         return []
 
     def getRolesForPrincipal(self, principal_id):
         ''' See the interface IPrincipalRoleManager '''
         pp = self._getPrincipalRoles()
-        if pp: 
+        if pp:
             return pp.getCol(principal_id)
         return []
 
     def getSetting(self, role_id, principal_id):
         ''' See the interface IPrincipalRoleManager '''
         pp = self._getPrincipalRoles()
-        if pp: 
+        if pp:
             return pp.getCell(role_id, principal_id, default=Unset)
         return Unset
 


=== Zope3/src/zope/app/security/grants/annotationrolepermissionmanager.py 1.1.2.2 => 1.1.2.3 ===
--- Zope3/src/zope/app/security/grants/annotationrolepermissionmanager.py:1.1.2.2	Tue Dec 24 07:51:16 2002
+++ Zope3/src/zope/app/security/grants/annotationrolepermissionmanager.py	Tue Dec 24 21:20:46 2002
@@ -2,14 +2,14 @@
 #
 # Copyright (c) 2001, 2002 Zope Corporation and Contributors.
 # All Rights Reserved.
-# 
+#
 # This software is subject to the provisions of the Zope Public License,
 # Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
 # THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
 # WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
 # FOR A PARTICULAR PURPOSE.
-# 
+#
 ##############################################################################
 """
 
@@ -110,4 +110,3 @@
                 rp = annotations[annotation_key] = PersistentLocalSecurityMap()
                 return rp
         return None
-


=== Zope3/src/zope/app/security/grants/metaconfigure.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/security/grants/metaconfigure.py:1.1.2.1	Mon Dec 23 17:22:39 2002
+++ Zope3/src/zope/app/security/grants/metaconfigure.py	Tue Dec 24 21:20:46 2002
@@ -2,14 +2,14 @@
 #
 # Copyright (c) 2001, 2002 Zope Corporation and Contributors.
 # All Rights Reserved.
-# 
+#
 # This software is subject to the provisions of the Zope Public License,
 # Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
 # THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
 # WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
 # FOR A PARTICULAR PURPOSE.
-# 
+#
 ##############################################################################
 """ Register security related configuration directives.
 
@@ -46,7 +46,7 @@
         if permission:
             return [
                 Action(
-                discriminator = ('grantPermissionToPrincipal', 
+                discriminator = ('grantPermissionToPrincipal',
                                  permission,
                                  principal),
                 callable = principal_perm_mgr.grantPermissionToPrincipal,
@@ -61,5 +61,3 @@
             args = (permission, role),
             )
             ]
-
-


=== Zope3/src/zope/app/security/grants/permissionroles.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/security/grants/permissionroles.py:1.1.2.1	Mon Dec 23 14:32:17 2002
+++ Zope3/src/zope/app/security/grants/permissionroles.py	Tue Dec 24 21:20:46 2002
@@ -50,4 +50,3 @@
             settings[role] = setting.getName()
         nosetting = Unset.getName()
         return [settings.get(role.getId(), nosetting) for role in self._roles]
-


=== Zope3/src/zope/app/security/grants/persistentlocalsecuritymap.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/security/grants/persistentlocalsecuritymap.py:1.1.2.1	Mon Dec 23 14:32:17 2002
+++ Zope3/src/zope/app/security/grants/persistentlocalsecuritymap.py	Tue Dec 24 21:20:46 2002
@@ -28,4 +28,3 @@
 
     def _empty_mapping(self):
         return PersistentDict()
-


=== Zope3/src/zope/app/security/grants/principalpermissionmanager.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/security/grants/principalpermissionmanager.py:1.1.2.1	Mon Dec 23 17:22:39 2002
+++ Zope3/src/zope/app/security/grants/principalpermissionmanager.py	Tue Dec 24 21:20:46 2002
@@ -2,14 +2,14 @@
 #
 # Copyright (c) 2001, 2002 Zope Corporation and Contributors.
 # All Rights Reserved.
-# 
+#
 # This software is subject to the provisions of the Zope Public License,
 # Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
 # THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
 # WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
 # FOR A PARTICULAR PURPOSE.
-# 
+#
 ##############################################################################
 """Mappings between principals and permissions."""
 


=== Zope3/src/zope/app/security/grants/principalrolemanager.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/security/grants/principalrolemanager.py:1.1.2.1	Mon Dec 23 17:22:39 2002
+++ Zope3/src/zope/app/security/grants/principalrolemanager.py	Tue Dec 24 21:20:46 2002
@@ -2,14 +2,14 @@
 #
 # Copyright (c) 2001, 2002 Zope Corporation and Contributors.
 # All Rights Reserved.
-# 
+#
 # This software is subject to the provisions of the Zope Public License,
 # Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
 # THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
 # WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
 # FOR A PARTICULAR PURPOSE.
-# 
+#
 ##############################################################################
 """Mappings between principals and roles."""
 


=== Zope3/src/zope/app/security/grants/rolepermissionmanager.py 1.1.2.2 => 1.1.2.3 ===
--- Zope3/src/zope/app/security/grants/rolepermissionmanager.py:1.1.2.2	Tue Dec 24 07:51:16 2002
+++ Zope3/src/zope/app/security/grants/rolepermissionmanager.py	Tue Dec 24 21:20:46 2002
@@ -2,14 +2,14 @@
 #
 # Copyright (c) 2001, 2002 Zope Corporation and Contributors.
 # All Rights Reserved.
-# 
+#
 # This software is subject to the provisions of the Zope Public License,
 # Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
 # THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
 # WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
 # FOR A PARTICULAR PURPOSE.
-# 
+#
 ##############################################################################
 """Mappings between roles and permissions."""
 


=== Zope3/src/zope/app/security/grants/rolepermissions.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/security/grants/rolepermissions.py:1.1.2.1	Mon Dec 23 14:32:17 2002
+++ Zope3/src/zope/app/security/grants/rolepermissions.py	Tue Dec 24 21:20:46 2002
@@ -2,14 +2,14 @@
 #
 # Copyright (c) 2001, 2002 Zope Corporation and Contributors.
 # All Rights Reserved.
-# 
+#
 # This software is subject to the provisions of the Zope Public License,
 # Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
 # THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
 # WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
 # FOR A PARTICULAR PURPOSE.
-# 
+#
 ##############################################################################
 """