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

[Stephan Richter]

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

Modified Files:
	configure.zcml session.py 
Log Message:
Removed zope.utilities.session's mapping interfaces. They duplicated the 
ones in interface.common.mapping; and the ones that did not overlap I just
added to common.mapping. This shoudl have been done like this from the 
beginning. I have no clue why it wasn't.


=== Zope3/src/zope/app/utilities/configure.zcml 1.6 => 1.7 ===
--- Zope3/src/zope/app/utilities/configure.zcml:1.6	Mon Feb  9 02:52:08 2004
+++ Zope3/src/zope/app/utilities/configure.zcml	Tue Feb 24 09:28:28 2004
@@ -14,7 +14,7 @@
   </content>
 
   <content class=".session.SessionData">
-    <allow interface="zope.app.interfaces.utilities.session.IFullMapping" />
+    <allow interface="zope.interface.common.mapping.IMapping" />
   </content>
 
   <content class=".session.PersistentSessionDataContainer">


=== Zope3/src/zope/app/utilities/session.py 1.7 => 1.8 ===
--- Zope3/src/zope/app/utilities/session.py:1.7	Fri Feb 20 17:02:32 2004
+++ Zope3/src/zope/app/utilities/session.py	Tue Feb 24 09:28:28 2004
@@ -15,26 +15,25 @@
 
 This is more of a demonstration than a full implementation, but it should
 work.
-"""
 
-# System imports
+$Id$
+"""
 import sha, time, string, random, hmac, logging
 from UserDict import IterableUserDict
 from heapq import heapify, heappop
 
-# Zope3 imports
 from persistence import Persistent
 from zope.server.http.http_date import build_http_date
 from zope.interface import implements
+from zope.interface.common.mapping import IMapping
 from zope.app import zapi
 from 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 \
         IBrowserIdManager, IBrowserId, ICookieBrowserIdManager, \
-        ISessionDataContainer, ISession, IFullMapping
+        ISessionDataContainer, ISession
 from zope.app.interfaces.container import IContained
 
 cookieSafeTrans = string.maketrans("+/", "-.")
@@ -168,11 +167,12 @@
 
 class SessionData(Persistent, IterableUserDict):
     ''' Mapping nodes in the ISessionDataContainer tree '''
-    implements(IFullMapping)
+    implements(IMapping)
 
     def __init__(self):
         self.data = OOBTree()
         self.lastAccessTime = time.time()
+
 
 class Session(IterableUserDict):
     implements(ISession)