[Zope3-checkins] CVS: Zope3/src/zope/app/security/registries - metaconfigure.py:1.1.2.2 permissionregistry.py:1.1.2.3 principalregistry.py:1.1.2.2 registeredobject.py:1.1.2.2 registry.py:1.1.2.2 roleregistry.py:1.1.2.2

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


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

Modified Files:
      Tag: NameGeddon-branch
	metaconfigure.py permissionregistry.py principalregistry.py 
	registeredobject.py registry.py roleregistry.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/registries/metaconfigure.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/security/registries/metaconfigure.py:1.1.2.1	Mon Dec 23 14:32:20 2002
+++ Zope3/src/zope/app/security/registries/metaconfigure.py	Tue Dec 24 21:20:47 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.
 
@@ -56,5 +56,3 @@
             args = (id, title, description),
             )
         ]
-
-


=== Zope3/src/zope/app/security/registries/permissionregistry.py 1.1.2.2 => 1.1.2.3 ===
--- Zope3/src/zope/app/security/registries/permissionregistry.py:1.1.2.2	Tue Dec 24 07:51:17 2002
+++ Zope3/src/zope/app/security/registries/permissionregistry.py	Tue Dec 24 21:20:47 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.
-# 
+#
 ##############################################################################
 """ Global permission registry."""
 
@@ -32,7 +32,7 @@
 
 class PermissionRegistry(Registry):
     __implements__ = IPermissionService
-    
+
     def __init__(self, prefix=PREFIX):
         Registry.__init__(self, Permission)
         self._prefix = prefix
@@ -58,7 +58,7 @@
 
     def ensurePermissionDefined(self, permission_id):
         """Check to make sure permission is defined.
-        
+
         If it isn't, an error is raised
         """
         if permission_id == CheckerPublic:


=== Zope3/src/zope/app/security/registries/principalregistry.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/security/registries/principalregistry.py:1.1.2.1	Mon Dec 23 14:32:20 2002
+++ Zope3/src/zope/app/security/registries/principalregistry.py	Tue Dec 24 21:20:47 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.
-# 
+#
 ##############################################################################
 """
 
@@ -33,7 +33,7 @@
     __implements__ = IAuthenticationService
 
     # Methods implementing IAuthenticationService
-    
+
     def authenticate(self, request):
         a = queryAdapter(request, ILoginPassword, None)
         if a is not None:
@@ -100,9 +100,9 @@
 
         if id in self.__principalsById or id == self.__defaultid:
             raise DuplicateId(id)
-        
+
         p = Principal(id, title, description, login, password)
-        
+
         self.__principalsByLogin[login]=p
         self.__principalsById[id]=p
 
@@ -153,4 +153,3 @@
 class UnauthenticatedPrincipal(PrincipalBase):
 
     __implements__ = IUnauthenticatedPrincipal
-    


=== Zope3/src/zope/app/security/registries/registeredobject.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/security/registries/registeredobject.py:1.1.2.1	Mon Dec 23 14:32:20 2002
+++ Zope3/src/zope/app/security/registries/registeredobject.py	Tue Dec 24 21:20:47 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.
-# 
+#
 ##############################################################################
 """An implementation of things that can be registered in a Registry."""
 


=== Zope3/src/zope/app/security/registries/registry.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/security/registries/registry.py:1.1.2.1	Mon Dec 23 14:32:20 2002
+++ Zope3/src/zope/app/security/registries/registry.py	Tue Dec 24 21:20:47 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.
-# 
+#
 ##############################################################################
 """Generic registry of ids to objects."""
 


=== Zope3/src/zope/app/security/registries/roleregistry.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/security/registries/roleregistry.py:1.1.2.1	Mon Dec 23 14:32:20 2002
+++ Zope3/src/zope/app/security/registries/roleregistry.py	Tue Dec 24 21:20:47 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.
-# 
+#
 ##############################################################################
 """Global role registry."""