[Checkins] SVN: zope.app.session/trunk/ Remove undeclared dependency on ``zope.deferredimport``

[Gediminas Paulauskas]

Log message for revision 116073:
  Remove undeclared dependency on ``zope.deferredimport``
  

Changed:
  U   zope.app.session/trunk/CHANGES.txt
  U   zope.app.session/trunk/src/zope/app/session/http.py
  U   zope.app.session/trunk/src/zope/app/session/interfaces.py
  U   zope.app.session/trunk/src/zope/app/session/session.py

-=-
Modified: zope.app.session/trunk/CHANGES.txt
===================================================================
--- zope.app.session/trunk/CHANGES.txt	2010-09-01 09:51:49 UTC (rev 116072)
+++ zope.app.session/trunk/CHANGES.txt	2010-09-01 10:39:46 UTC (rev 116073)
@@ -5,6 +5,8 @@
 3.6.2 (unreleased)
 ------------------
 
+- Remove undeclared dependency on ``zope.deferredimport``.
+
 3.6.1 (2010-02-06)
 ------------------
 

Modified: zope.app.session/trunk/src/zope/app/session/http.py
===================================================================
--- zope.app.session/trunk/src/zope/app/session/http.py	2010-09-01 09:51:49 UTC (rev 116072)
+++ zope.app.session/trunk/src/zope/app/session/http.py	2010-09-01 10:39:46 UTC (rev 116073)
@@ -16,14 +16,10 @@
 $Id$
 """
 
-import zope.deferredimport
-
-zope.deferredimport.deprecated(
-    "It has moved to zope.session.http  This reference will be gone sometimes.",
-    ICookieClientIdManager = 'zope.session.http:ICookieClientIdManager',
-    MissingClientIdException = 'zope.session.http:MissingClientIdException',
-    notifyVirtualHostChanged = 'zope.session.http:notifyVirtualHostChanged',
-    CookieClientIdManager = 'zope.session.http:CookieClientIdManager',
-    digestEncode = 'zope.session.http:digestEncode',
-    cookieSafeTrans = 'zope.session.http:cookieSafeTrans',
-    )
+# BBB
+from zope.session.http import (ICookieClientIdManager,
+                               MissingClientIdException,
+                               notifyVirtualHostChanged,
+                               CookieClientIdManager,
+                               digestEncode,
+                               cookieSafeTrans)

Modified: zope.app.session/trunk/src/zope/app/session/interfaces.py
===================================================================
--- zope.app.session/trunk/src/zope/app/session/interfaces.py	2010-09-01 09:51:49 UTC (rev 116072)
+++ zope.app.session/trunk/src/zope/app/session/interfaces.py	2010-09-01 10:39:46 UTC (rev 116073)
@@ -16,14 +16,10 @@
 $Id$
 """
 
-import zope.deferredimport
-
-zope.deferredimport.deprecated(
-    "It has moved to zope.session.interfaces  This reference will be gone sometimes.",
-    IClientIdManager = 'zope.session.interfaces:IClientIdManager',
-    IClientId = 'zope.session.interfaces:IClientId',
-    ISessionDataContainer = 'zope.session.interfaces:ISessionDataContainer',
-    ISession = 'zope.session.interfaces:ISession',
-    ISessionData = 'zope.session.interfaces:ISessionData',
-    ISessionPkgData = 'zope.session.interfaces:ISessionPkgData',
-    )
+# BBB
+from zope.session.interfaces import (IClientIdManager,
+                                     IClientId,
+                                     ISessionDataContainer,
+                                     ISession,
+                                     ISessionData,
+                                     ISessionPkgData)

Modified: zope.app.session/trunk/src/zope/app/session/session.py
===================================================================
--- zope.app.session/trunk/src/zope/app/session/session.py	2010-09-01 09:51:49 UTC (rev 116072)
+++ zope.app.session/trunk/src/zope/app/session/session.py	2010-09-01 10:39:46 UTC (rev 116073)
@@ -16,16 +16,12 @@
 $Id$
 """
 
-import zope.deferredimport
-
-zope.deferredimport.deprecated(
-    "It has moved to zope.session.session  This reference will be gone sometimes.",
-    SessionData = 'zope.session.session:SessionData',
-    SessionPkgData = 'zope.session.session:SessionPkgData',
-    Session = 'zope.session.session:Session',
-    RAMSessionDataContainer = 'zope.session.session:RAMSessionDataContainer',
-    PersistentSessionDataContainer = 'zope.session.session:PersistentSessionDataContainer',
-    ClientId = 'zope.session.session:ClientId',
-    digestEncode = 'zope.session.session:digestEncode',
-    cookieSafeTrans = 'zope.session.session:cookieSafeTrans',
-    )
+# BBB
+from zope.session.session import (SessionData,
+                                  SessionPkgData,
+                                  Session,
+                                  RAMSessionDataContainer,
+                                  PersistentSessionDataContainer,
+                                  ClientId,
+                                  digestEncode,
+                                  cookieSafeTrans)