[Checkins] SVN: zope.session/trunk/ Drop support for Python 2.4 and 2.5.

[Tres Seaver]

Log message for revision 126129:
  Drop support for Python 2.4 and 2.5.
  
  Replace deprecated 'zope.component.adapts' usage with equivalent
  'zope.component.adapter' decorator.
  
  Replace deprecated 'zope.interface.implements' usage with equivalent
  'zope.interface.implementer' decorator.
  
  

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

-=-
Modified: zope.session/trunk/CHANGES.txt
===================================================================
--- zope.session/trunk/CHANGES.txt	2012-05-18 15:12:55 UTC (rev 126128)
+++ zope.session/trunk/CHANGES.txt	2012-05-18 15:17:00 UTC (rev 126129)
@@ -1,12 +1,18 @@
 CHANGES
 =======
 
-3.9.6 (unreleased)
+4.0.0 (unreleased)
 ------------------
 
-- TBD
+- Replaced deprecated ``zope.component.adapts`` usage with equivalent
+  ``zope.component.adapter`` decorator.
 
+- Replaced deprecated ``zope.interface.implements`` usage with equivalent
+  ``zope.interface.implementer`` decorator.
 
+- Dropped support for Python 2.4 and 2.5.
+
+
 3.9.5 (2011-08-11)
 ------------------
 

Modified: zope.session/trunk/setup.py
===================================================================
--- zope.session/trunk/setup.py	2012-05-18 15:12:55 UTC (rev 126128)
+++ zope.session/trunk/setup.py	2012-05-18 15:17:00 UTC (rev 126129)
@@ -27,7 +27,7 @@
     return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
 
 setup(name='zope.session',
-    version='3.9.6dev',
+    version='4.0.0dev',
     author='Zope Foundation and Contributors',
     author_email='zope-dev at zope.org',
     description='Client identification and sessions for Zope',
@@ -48,6 +48,9 @@
         'Intended Audience :: Developers',
         'License :: OSI Approved :: Zope Public License',
         'Programming Language :: Python',
+        'Programming Language :: Python :: 2',
+        'Programming Language :: Python :: 2.6',
+        'Programming Language :: Python :: 2.7',
         'Natural Language :: English',
         'Operating System :: OS Independent',
         'Topic :: Internet :: WWW/HTTP',

Modified: zope.session/trunk/src/zope/session/http.py
===================================================================
--- zope.session/trunk/src/zope/session/http.py	2012-05-18 15:12:55 UTC (rev 126128)
+++ zope.session/trunk/src/zope/session/http.py	2012-05-18 15:17:00 UTC (rev 126129)
@@ -32,7 +32,7 @@
 import zope.location
 from persistent import Persistent
 from zope import schema, component
-from zope.interface import implements
+from zope.interface import implementer
 from zope.publisher.interfaces.http import IHTTPRequest
 from zope.publisher.interfaces.http import IHTTPApplicationRequest
 from zope.i18nmessageid import ZopeMessageFactory as _
@@ -130,10 +130,10 @@
         )
 
 
+ at implementer(IClientIdManager, ICookieClientIdManager)
 class CookieClientIdManager(zope.location.Location, Persistent):
     """Session utility implemented using cookies."""
 
-    implements(IClientIdManager, ICookieClientIdManager)
 
     thirdparty = FieldProperty(ICookieClientIdManager['thirdparty'])
     cookieLifetime = FieldProperty(ICookieClientIdManager['cookieLifetime'])
@@ -551,8 +551,8 @@
     setRequestId if a cookie is present in the response for that manager. To
     demonstrate we create a dummy manager object and event:
 
-        >>> class DummyManager(object):
-        ...     implements(ICookieClientIdManager)
+        >>> @implementer(ICookieClientIdManager)
+        ... class DummyManager(object):
         ...     namespace = 'foo'
         ...     thirdparty = False
         ...     request_id = None

Modified: zope.session/trunk/src/zope/session/session.py
===================================================================
--- zope.session/trunk/src/zope/session/session.py	2012-05-18 15:12:55 UTC (rev 126128)
+++ zope.session/trunk/src/zope/session/session.py	2012-05-18 15:17:00 UTC (rev 126129)
@@ -43,6 +43,8 @@
     return s.encode("base64")[:-2].translate(cookieSafeTrans)
 
 
+ at zope.interface.implementer(IClientId)
+ at zope.component.adapter(IRequest)
 class ClientId(str):
     """See zope.session.interfaces.IClientId
 
@@ -57,8 +59,6 @@
         >>> tests.tearDown()
 
     """
-    zope.interface.implements(IClientId)
-    zope.component.adapts(IRequest)
 
     def __new__(cls, request):
         return str.__new__(cls,
@@ -66,12 +66,12 @@
             )
 
 
+ at zope.interface.implementer(ISessionDataContainer)
 class PersistentSessionDataContainer(zope.location.Location,
     persistent.Persistent,
     IterableUserDict):
     """A SessionDataContainer that stores data in the ZODB"""
 
-    zope.interface.implements(ISessionDataContainer)
 
     _v_last_sweep = 0 # Epoch time sweep last run
     disable_implicit_sweeps = False
@@ -350,10 +350,10 @@
         self._ram_db.pack(time.time())
 
 
+ at zope.interface.implementer(ISession)
+ at zope.component.adapter(IRequest)
 class Session(object):
     """See zope.session.interfaces.ISession"""
-    zope.interface.implements(ISession)
-    zope.component.adapts(IRequest)
 
     def __init__(self, request):
         self.client_id = str(IClientId(request))
@@ -474,6 +474,7 @@
         raise NotImplementedError
 
 
+ at zope.interface.implementer(ISessionData)
 class SessionData(persistent.Persistent, IterableUserDict):
     """See zope.session.interfaces.ISessionData
 
@@ -520,7 +521,6 @@
         13
 
     """
-    zope.interface.implements(ISessionData)
 
     # this is for support of legacy sessions; this comment and
     # the next line will be removed in a later release
@@ -552,6 +552,7 @@
                               doc='integer value of the last access time')
 
 
+ at zope.interface.implementer(ISessionPkgData)
 class SessionPkgData(persistent.Persistent, IterableUserDict):
     """See zope.session.interfaces.ISessionPkgData
 
@@ -559,6 +560,5 @@
         >>> ISessionPkgData.providedBy(session)
         True
     """
-    zope.interface.implements(ISessionPkgData)
     def __init__(self):
         self.data = OOBTree()