[Checkins] SVN: lovely.remotetask/trunk/s try to be more backward compatible with older versions of zope.app.session

[Fred L. Drake, Jr.]

Log message for revision 81030:
  try to be more backward compatible with older versions of zope.app.session

Changed:
  U   lovely.remotetask/trunk/setup.py
  U   lovely.remotetask/trunk/src/lovely/remotetask/browser/service.py

-=-
Modified: lovely.remotetask/trunk/setup.py
===================================================================
--- lovely.remotetask/trunk/setup.py	2007-10-24 13:50:58 UTC (rev 81029)
+++ lovely.remotetask/trunk/setup.py	2007-10-24 13:59:10 UTC (rev 81030)
@@ -31,6 +31,9 @@
                         'zope.app.pagetemplate',
                         'zope.app.publication',
                         'zope.app.publisher',
+                        # We depend on zope.app.session, but
+                        # import from zope.session if available,
+                        # to avoid deprecation warnings.
                         'zope.app.session',
                         'zope.app.xmlrpcintrospection',
                         'zope.component',

Modified: lovely.remotetask/trunk/src/lovely/remotetask/browser/service.py
===================================================================
--- lovely.remotetask/trunk/src/lovely/remotetask/browser/service.py	2007-10-24 13:50:58 UTC (rev 81029)
+++ lovely.remotetask/trunk/src/lovely/remotetask/browser/service.py	2007-10-24 13:59:10 UTC (rev 81030)
@@ -24,9 +24,16 @@
 from zope.publisher.browser import BrowserPage
 from zope.publisher.interfaces import NotFound
 from zope.security.proxy import removeSecurityProxy
-from zope.session.interfaces import ISession
 from zope.traversing.browser.absoluteurl import absoluteURL
 
+try:
+    # Newer versions of zope.app.session have deprecated IClientId,
+    # so prefer to new location:
+    from zope.session.interfaces import ISession
+except ImportError:
+    # But still support the old location if we can't get it from the new:
+    from zope.app.session.interfaces import ISession
+
 from zope.app.pagetemplate import ViewPageTemplateFile
 from zope.app.container.contained import contained