[Zope3-checkins] SVN: Zope3/branches/ZopeX3-3.0/src/zope/app/pluggableauth/ Backported rev27154.

[Stephan Richter]

Log message for revision 27158:
  Backported rev27154.
  
  I know, this is a small API change; but better break the rule than 
  forever support this mistake. No code changed though and I tested the 
  new behavior.
  


Changed:
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/pluggableauth/__init__.py
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/pluggableauth/interfaces.py


-=-
Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/pluggableauth/__init__.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/pluggableauth/__init__.py	2004-08-16 23:29:07 UTC (rev 27157)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/pluggableauth/__init__.py	2004-08-16 23:55:19 UTC (rev 27158)
@@ -48,8 +48,8 @@
 from zope.app.component.localservice import queryNextService
 
 from interfaces import IUserSchemafied, IPluggableAuthenticationService
-from interfaces import \
-     IPrincipalSource, ILoginPasswordPrincipalSource, IContainerPrincipalSource
+from interfaces import IPrincipalSource, ILoginPasswordPrincipalSource
+from interfaces import IContainedPrincipalSource, IContainerPrincipalSource
 
 def gen_key():
     """Return a random int (1, MAXINT), suitable for use as a BTree key."""
@@ -231,6 +231,7 @@
 class IBTreePrincipalSource(
     ILoginPasswordPrincipalSource,
     IContainerPrincipalSource,
+    IContainedPrincipalSource,
     INameChooser,
     IContainerNamesContainer,
     ):

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/pluggableauth/interfaces.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/pluggableauth/interfaces.py	2004-08-16 23:29:07 UTC (rev 27157)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/pluggableauth/interfaces.py	2004-08-16 23:55:19 UTC (rev 27158)
@@ -104,9 +104,15 @@
         effecting his security profile on the site.  """
 
 
-class IContainerPrincipalSource(IPrincipalSource, IContained):
+class IContainerPrincipalSource(IContainer):
     """This is a marker interface for specifying principal sources that are
     also containers. """
+    
 
+class IContainedPrincipalSource(IPrincipalSource, IContained):
+    """This is a marker interface for principal sources that can be directly
+    added to an authentication service. It ensures that principal source can
+    **only** be added to pluggable authentication services."""
+
     __parent__= Field(
         constraint = ContainerTypesConstraint(IPluggableAuthenticationService))