[Zope3-checkins] CVS: Zope3/src/zope/app/utilities - session.py:1.1.2.3

[Stuart Bishop]

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

Modified Files:
      Tag: ozzope-session-branch
	session.py 
Log Message:
About to migrate to HEAD


=== Zope3/src/zope/app/utilities/session.py 1.1.2.2 => 1.1.2.3 ===
--- Zope3/src/zope/app/utilities/session.py:1.1.2.2	Sun Feb  8 22:08:59 2004
+++ Zope3/src/zope/app/utilities/session.py	Mon Feb  9 00:10:11 2004
@@ -33,7 +33,7 @@
 # Sibling imports
 from zope.app.interfaces.utilities.session import \
         IBrowserIdManager, IBrowserId, ICookieBrowserIdManager, \
-        ISessionDataContainer, ISession, IFullMapping, BrowserIdManager
+        ISessionDataContainer, ISession, IFullMapping
 from zope.app.interfaces.container import IContained
 
 cookieSafeTrans = string.maketrans("+/", "-.")
@@ -51,7 +51,7 @@
 class CookieBrowserIdManager(Persistent):
     """Session service implemented using cookies."""
 
-    implements(ICookieBrowserIdManager, IContained)
+    implements(IBrowserIdManager, ICookieBrowserIdManager, IContained)
 
     __parent__ = __name__ = None
 
@@ -181,7 +181,7 @@
                 context, ISessionDataContainer, session_data_container
                 )
 
-    bim = zapi.getUtility(context, IBrowserIdManager, BrowserIdManager)
+    bim = zapi.getUtility(context, IBrowserIdManager)
     browser_id = bim.getBrowserId(request)
     return Session(dc, browser_id, product_id)