[Checkins] SVN: zope.app.authentication/trunk/ Start using zope.container.

[Martijn Faassen]

Log message for revision 95448:
  Start using zope.container.
  

Changed:
  U   zope.app.authentication/trunk/CHANGES.txt
  U   zope.app.authentication/trunk/buildout.cfg
  U   zope.app.authentication/trunk/src/zope/app/authentication/authentication.py
  U   zope.app.authentication/trunk/src/zope/app/authentication/groupfolder.py
  U   zope.app.authentication/trunk/src/zope/app/authentication/groupfolder.zcml
  U   zope.app.authentication/trunk/src/zope/app/authentication/httpplugins.py
  U   zope.app.authentication/trunk/src/zope/app/authentication/idpicker.py
  U   zope.app.authentication/trunk/src/zope/app/authentication/interfaces.py
  U   zope.app.authentication/trunk/src/zope/app/authentication/principalfolder.py
  U   zope.app.authentication/trunk/src/zope/app/authentication/principalfolder.zcml
  U   zope.app.authentication/trunk/src/zope/app/authentication/session.py

-=-
Modified: zope.app.authentication/trunk/CHANGES.txt
===================================================================
--- zope.app.authentication/trunk/CHANGES.txt	2009-01-29 16:28:18 UTC (rev 95447)
+++ zope.app.authentication/trunk/CHANGES.txt	2009-01-29 16:32:48 UTC (rev 95448)
@@ -3,7 +3,10 @@
 =======
 
 3.5.0 (unreleased)
+------------------
 
+* Use ``zope.container`` instead of ``zope.app.container``.
+
 * Encoded passwords are now stored with a prefix ({MD5}, {SHA1},
   {SSHA}) indicating the used encoding schema. Old (encoded) passwords
   can still be used.

Modified: zope.app.authentication/trunk/buildout.cfg
===================================================================
--- zope.app.authentication/trunk/buildout.cfg	2009-01-29 16:28:18 UTC (rev 95447)
+++ zope.app.authentication/trunk/buildout.cfg	2009-01-29 16:32:48 UTC (rev 95448)
@@ -1,5 +1,5 @@
 [buildout]
-develop = .
+develop = . ../zope.container ../zope.app.container
 parts = test
 
 [test]

Modified: zope.app.authentication/trunk/src/zope/app/authentication/authentication.py
===================================================================
--- zope.app.authentication/trunk/src/zope/app/authentication/authentication.py	2009-01-29 16:28:18 UTC (rev 95447)
+++ zope.app.authentication/trunk/src/zope/app/authentication/authentication.py	2009-01-29 16:32:48 UTC (rev 95448)
@@ -22,11 +22,11 @@
 
 from zope.app.security.interfaces import IAuthentication, PrincipalLookupError
 from zope.app.component import queryNextUtility
-import zope.app.container.btree
+import zope.container.btree
 
 from zope.app.authentication import interfaces
 
-class PluggableAuthentication(zope.app.container.btree.BTreeContainer):
+class PluggableAuthentication(zope.container.btree.BTreeContainer):
 
     zope.interface.implements(
         IAuthentication,

Modified: zope.app.authentication/trunk/src/zope/app/authentication/groupfolder.py
===================================================================
--- zope.app.authentication/trunk/src/zope/app/authentication/groupfolder.py	2009-01-29 16:28:18 UTC (rev 95447)
+++ zope.app.authentication/trunk/src/zope/app/authentication/groupfolder.py	2009-01-29 16:32:48 UTC (rev 95448)
@@ -24,9 +24,9 @@
 from zope.security.interfaces import (
     IGroup, IGroupAwarePrincipal, IMemberAwareGroup)
 
-from zope.app.container.btree import BTreeContainer
-import zope.app.container.constraints
-import zope.app.container.interfaces
+from zope.container.btree import BTreeContainer
+import zope.container.constraints
+import zope.container.interfaces
 from zope.app.authentication.i18n import ZopeMessageFactory as _
 import zope.app.security.vocabulary
 from zope.app.security.interfaces import (
@@ -55,9 +55,9 @@
         required=False)
 
 
-class IGroupFolder(zope.app.container.interfaces.IContainer):
+class IGroupFolder(zope.container.interfaces.IContainer):
 
-    zope.app.container.constraints.contains(IGroupInformation)
+    zope.container.constraints.contains(IGroupInformation)
 
     prefix = schema.TextLine(
         title=_("Group ID prefix"),
@@ -72,9 +72,9 @@
         """Get principals which belong to the group"""
 
 
-class IGroupContained(zope.app.container.interfaces.IContained):
+class IGroupContained(zope.container.interfaces.IContained):
 
-    zope.app.container.constraints.containers(IGroupFolder)
+    zope.container.constraints.containers(IGroupFolder)
 
 class IGroupSearchCriteria(interface.Interface):
 

Modified: zope.app.authentication/trunk/src/zope/app/authentication/groupfolder.zcml
===================================================================
--- zope.app.authentication/trunk/src/zope/app/authentication/groupfolder.zcml	2009-01-29 16:28:18 UTC (rev 95447)
+++ zope.app.authentication/trunk/src/zope/app/authentication/groupfolder.zcml	2009-01-29 16:32:48 UTC (rev 95448)
@@ -21,13 +21,13 @@
         />
     <require
         permission="zope.ManageServices"
-        interface="zope.app.container.interfaces.IContainer
-                   zope.app.container.interfaces.INameChooser"
+        interface="zope.container.interfaces.IContainer
+                   zope.container.interfaces.INameChooser"
         />
   </class>
 
   <adapter
-      provides="zope.app.container.interfaces.INameChooser"
+      provides="zope.container.interfaces.INameChooser"
       for=".groupfolder.IGroupFolder"
       factory=".idpicker.IdPicker"
       />

Modified: zope.app.authentication/trunk/src/zope/app/authentication/httpplugins.py
===================================================================
--- zope.app.authentication/trunk/src/zope/app/authentication/httpplugins.py	2009-01-29 16:28:18 UTC (rev 95447)
+++ zope.app.authentication/trunk/src/zope/app/authentication/httpplugins.py	2009-01-29 16:32:48 UTC (rev 95448)
@@ -22,7 +22,7 @@
 from zope.publisher.interfaces.http import IHTTPRequest
 from zope.schema import TextLine
 
-from zope.app.container.contained import Contained
+from zope.container.contained import Contained
 from zope.app.authentication import interfaces
 
 

Modified: zope.app.authentication/trunk/src/zope/app/authentication/idpicker.py
===================================================================
--- zope.app.authentication/trunk/src/zope/app/authentication/idpicker.py	2009-01-29 16:28:18 UTC (rev 95447)
+++ zope.app.authentication/trunk/src/zope/app/authentication/idpicker.py	2009-01-29 16:32:48 UTC (rev 95448)
@@ -19,7 +19,7 @@
 
 import re
 from zope.exceptions.interfaces import UserError
-from zope.app.container.contained import NameChooser
+from zope.container.contained import NameChooser
 from zope.app.authentication.i18n import ZopeMessageFactory as _
 
 ok = re.compile('[!-~]+$').match

Modified: zope.app.authentication/trunk/src/zope/app/authentication/interfaces.py
===================================================================
--- zope.app.authentication/trunk/src/zope/app/authentication/interfaces.py	2009-01-29 16:28:18 UTC (rev 95447)
+++ zope.app.authentication/trunk/src/zope/app/authentication/interfaces.py	2009-01-29 16:32:48 UTC (rev 95448)
@@ -22,8 +22,8 @@
 import zope.security.interfaces
 from zope.app.authentication.i18n import ZopeMessageFactory as _
 from zope.app.security.interfaces import ILogout
-from zope.app.container.constraints import contains, containers
-from zope.app.container.interfaces import IContainer
+from zope.container.constraints import contains, containers
+from zope.container.interfaces import IContainer
 
 
 class IPlugin(zope.interface.Interface):

Modified: zope.app.authentication/trunk/src/zope/app/authentication/principalfolder.py
===================================================================
--- zope.app.authentication/trunk/src/zope/app/authentication/principalfolder.py	2009-01-29 16:28:18 UTC (rev 95447)
+++ zope.app.authentication/trunk/src/zope/app/authentication/principalfolder.py	2009-01-29 16:32:48 UTC (rev 95448)
@@ -24,10 +24,10 @@
 from zope.schema import Text, TextLine, Password, Choice
 from zope.publisher.interfaces import IRequest
 
-from zope.app.container.interfaces import DuplicateIDError
-from zope.app.container.contained import Contained
-from zope.app.container.constraints import contains, containers
-from zope.app.container.btree import BTreeContainer
+from zope.container.interfaces import DuplicateIDError
+from zope.container.contained import Contained
+from zope.container.constraints import contains, containers
+from zope.container.btree import BTreeContainer
 from zope.app.authentication.i18n import ZopeMessageFactory as _
 from zope.app.security.interfaces import IAuthentication
 

Modified: zope.app.authentication/trunk/src/zope/app/authentication/principalfolder.zcml
===================================================================
--- zope.app.authentication/trunk/src/zope/app/authentication/principalfolder.zcml	2009-01-29 16:28:18 UTC (rev 95447)
+++ zope.app.authentication/trunk/src/zope/app/authentication/principalfolder.zcml	2009-01-29 16:32:48 UTC (rev 95448)
@@ -19,7 +19,7 @@
 
     <require
         permission="zope.ManageServices"
-        interface="zope.app.container.interfaces.IContainer"
+        interface="zope.container.interfaces.IContainer"
         />
 
     <require
@@ -30,7 +30,7 @@
   </class>
 
   <adapter
-      provides="zope.app.container.interfaces.INameChooser"
+      provides="zope.container.interfaces.INameChooser"
       for=".principalfolder.IInternalPrincipalContainer"
       factory=".idpicker.IdPicker"
       />

Modified: zope.app.authentication/trunk/src/zope/app/authentication/session.py
===================================================================
--- zope.app.authentication/trunk/src/zope/app/authentication/session.py	2009-01-29 16:28:18 UTC (rev 95447)
+++ zope.app.authentication/trunk/src/zope/app/authentication/session.py	2009-01-29 16:32:48 UTC (rev 95448)
@@ -29,7 +29,7 @@
 from zope.traversing.browser.absoluteurl import absoluteURL
 
 from zope.app.component import hooks
-from zope.app.container.contained import Contained
+from zope.container.contained import Contained
 from zope.app.authentication.interfaces import ICredentialsPlugin
 
 class ISessionCredentials(Interface):