[Zope3-checkins] CVS: Zope3/src/zope/app/utilities - configure.zcml:1.6 session.py:1.3

[Stuart Bishop]

Update of /cvs-repository/Zope3/src/zope/app/utilities
In directory cvs.zope.org:/tmp/cvs-serv17367/src/zope/app/utilities

Modified Files:
	configure.zcml session.py 
Log Message:
Session Utilities working and installed by default. Next step making ZPT access nice


=== Zope3/src/zope/app/utilities/configure.zcml 1.5 => 1.6 ===
--- Zope3/src/zope/app/utilities/configure.zcml:1.5	Mon Feb  9 00:16:32 2004
+++ Zope3/src/zope/app/utilities/configure.zcml	Mon Feb  9 02:52:08 2004
@@ -5,10 +5,6 @@
   <!-- Session machinery -->
 
   <content class=".session.CookieBrowserIdManager">
-    <implements
-      interface="zope.app.interfaces.services.utility.ILocalUtility" />
-    <implements
-      interface="zope.app.interfaces.annotation.IAttributeAnnotatable" />
     <require
       interface="zope.app.interfaces.utilities.session.ICookieBrowserIdManager"
       permission="zope.Public" />
@@ -24,10 +20,6 @@
   <content class=".session.PersistentSessionDataContainer">
     <implements
       interface="zope.app.interfaces.utilities.session.ISessionDataContainer"/>
-    <implements
-      interface="zope.app.interfaces.services.utility.ILocalUtility" />
-    <implements
-      interface="zope.app.interfaces.annotation.IAttributeAnnotatable" />
     <require
       interface="zope.app.interfaces.utilities.session.ISessionDataContainer"
       permission="zope.Public" />


=== Zope3/src/zope/app/utilities/session.py 1.2 => 1.3 ===
--- Zope3/src/zope/app/utilities/session.py:1.2	Mon Feb  9 00:16:32 2004
+++ Zope3/src/zope/app/utilities/session.py	Mon Feb  9 02:52:08 2004
@@ -29,6 +29,8 @@
 from zope.interface import implements
 from zope.app import zapi
 from zodb.btrees.OOBTree import OOBTree
+from zope.app.interfaces.services.utility import ILocalUtility
+from zope.app.interfaces.annotation import IAttributeAnnotatable
 
 # Sibling imports
 from zope.app.interfaces.utilities.session import \
@@ -51,7 +53,10 @@
 class CookieBrowserIdManager(Persistent):
     """Session service implemented using cookies."""
 
-    implements(IBrowserIdManager, ICookieBrowserIdManager, IContained)
+    implements(
+            IBrowserIdManager, ICookieBrowserIdManager, IContained,
+            ILocalUtility, IAttributeAnnotatable
+            )
 
     __parent__ = __name__ = None
 
@@ -132,7 +137,10 @@
 class PersistentSessionDataContainer(Persistent, IterableUserDict):
     ''' A SessionDataContainer that stores data in the ZODB '''
     __parent__ = __name__ = None
-    implements(ISessionDataContainer, IContained)
+    implements(
+            ISessionDataContainer, IContained,
+            ILocalUtility, IAttributeAnnotatable
+            )
 
     def __init__(self):
         self.data = OOBTree()