[Zope3-checkins] CVS: Zope3/lib/python/Zope/App/OFS/Services/AuthenticationService - AuthenticationService.py:1.6 configure.zcml:1.5

Gary Poster gary@zope.com
Wed, 18 Dec 2002 14:15:34 -0500


Update of /cvs-repository/Zope3/lib/python/Zope/App/OFS/Services/AuthenticationService
In directory cvs.zope.org:/tmp/cvs-serv17208

Modified Files:
	AuthenticationService.py configure.zcml 
Log Message:
removing IHomogenousContainer references


=== Zope3/lib/python/Zope/App/OFS/Services/AuthenticationService/AuthenticationService.py 1.5 => 1.6 ===
--- Zope3/lib/python/Zope/App/OFS/Services/AuthenticationService/AuthenticationService.py:1.5	Fri Dec  6 08:12:08 2002
+++ Zope3/lib/python/Zope/App/OFS/Services/AuthenticationService/AuthenticationService.py	Wed Dec 18 14:15:03 2002
@@ -19,7 +19,7 @@
 from Zope.Exceptions import NotFoundError
 from Zope.ComponentArchitecture import getAdapter, queryAdapter
 
-from Zope.App.OFS.Container.IContainer import IHomogenousContainer, IContainer
+from Zope.App.OFS.Container.IContainer import IContainer
 from Zope.App.OFS.Container.BTreeContainer import BTreeContainer
 
 from Zope.App.Security.ILoginPassword import ILoginPassword
@@ -30,8 +30,7 @@
 class DuplicateLogin(Exception): pass
 class DuplicateId(Exception): pass
 
-class ILocalAuthenticationService(IAuthenticationService, IContainer,
-                                  IHomogenousContainer):
+class ILocalAuthenticationService(IAuthenticationService, IContainer):
     """TTW manageable authentication service"""
 
     def getAllUsers():
@@ -97,16 +96,3 @@
                   if p.getTitle().lower().startswith(name) or
                      p.getLogin().lower().startswith(name)]
 
-    ######################################
-    # from: Zope.App.OFS.Container.IContainer.IHomogenousContainer
-
-    def isAddable(self, interfaces):
-        'See Zope.App.OFS.Container.IContainer.IHomogenousContainer'
-        if type(interfaces) != TupleType:
-            interfaces = (interfaces,)
-        if IUser in interfaces:
-            return 1
-        return 0
-
-    #
-    ############################################################


=== Zope3/lib/python/Zope/App/OFS/Services/AuthenticationService/configure.zcml 1.4 => 1.5 ===
--- Zope3/lib/python/Zope/App/OFS/Services/AuthenticationService/configure.zcml:1.4	Tue Nov 19 18:21:45 2002
+++ Zope3/lib/python/Zope/App/OFS/Services/AuthenticationService/configure.zcml	Wed Dec 18 14:15:03 2002
@@ -14,9 +14,6 @@
         interface="Zope.App.Security.IAuthenticationService." />
     <require
         permission="Zope.View"
-        interface="Zope.App.OFS.Container.IContainer.IHomogenousContainer" />
-    <require
-        permission="Zope.View"
         attributes="getAllUsers" />
 
     <require