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

[Tres Seaver]

Log message for revision 126078:
  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.keyreference/trunk/CHANGES.txt
  U   zope.keyreference/trunk/setup.py
  U   zope.keyreference/trunk/src/zope/keyreference/persistent.py
  U   zope.keyreference/trunk/src/zope/keyreference/persistent.txt
  U   zope.keyreference/trunk/src/zope/keyreference/testing.py

-=-
Modified: zope.keyreference/trunk/CHANGES.txt
===================================================================
--- zope.keyreference/trunk/CHANGES.txt	2012-05-18 13:08:12 UTC (rev 126077)
+++ zope.keyreference/trunk/CHANGES.txt	2012-05-18 13:09:05 UTC (rev 126078)
@@ -2,12 +2,18 @@
 CHANGES
 =======
 
-3.6.5 (unreleased)
+4.0.0 (unreleased)
 ------------------
 
-- Nothing changed yet.
+- 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.6.4 (2011-11-30)
 ------------------
 

Modified: zope.keyreference/trunk/setup.py
===================================================================
--- zope.keyreference/trunk/setup.py	2012-05-18 13:08:12 UTC (rev 126077)
+++ zope.keyreference/trunk/setup.py	2012-05-18 13:09:05 UTC (rev 126078)
@@ -25,7 +25,7 @@
     return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
 
 setup(name = 'zope.keyreference',
-      version='3.6.5dev',
+      version='4.0.0dev',
       author='Zope Foundation and Contributors',
       author_email='zope-dev at zope.org',
       description='Key References',
@@ -46,6 +46,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.keyreference/trunk/src/zope/keyreference/persistent.py
===================================================================
--- zope.keyreference/trunk/src/zope/keyreference/persistent.py	2012-05-18 13:08:12 UTC (rev 126077)
+++ zope.keyreference/trunk/src/zope/keyreference/persistent.py	2012-05-18 13:09:05 UTC (rev 126078)
@@ -21,13 +21,13 @@
 
 import zope.keyreference.interfaces
 
+ at zope.interface.implementer(zope.keyreference.interfaces.IKeyReference)
 class KeyReferenceToPersistent(object):
     """An IKeyReference for persistent objects which is comparable.
 
     These references compare by database name and _p_oids of the objects they
     reference.
     """
-    zope.interface.implements(zope.keyreference.interfaces.IKeyReference)
 
     key_type_id = 'zope.app.keyreference.persistent'
 

Modified: zope.keyreference/trunk/src/zope/keyreference/persistent.txt
===================================================================
--- zope.keyreference/trunk/src/zope/keyreference/persistent.txt	2012-05-18 13:08:12 UTC (rev 126077)
+++ zope.keyreference/trunk/src/zope/keyreference/persistent.txt	2012-05-18 13:09:05 UTC (rev 126078)
@@ -48,11 +48,11 @@
 Key references should sort first on their key type and second on any
 type-specific information:
 
-    >>> from zope.interface import implements
+    >>> from zope.interface import implementer
     >>> from zope.keyreference.interfaces import IKeyReference
 
-    >>> class DummyKeyReference(object):
-    ...     implements(IKeyReference)
+    >>> @implementer(IKeyReference)
+    ... class DummyKeyReference(object):
     ...     key_type_id = 'zope.app.keyreference.object'
     ...     def __init__(self, obj):
     ...         self.object = obj

Modified: zope.keyreference/trunk/src/zope/keyreference/testing.py
===================================================================
--- zope.keyreference/trunk/src/zope/keyreference/testing.py	2012-05-18 13:08:12 UTC (rev 126077)
+++ zope.keyreference/trunk/src/zope/keyreference/testing.py	2012-05-18 13:09:05 UTC (rev 126078)
@@ -17,11 +17,11 @@
 import zope.component
 import zope.keyreference.interfaces
 
+ at zope.component.adapter(zope.interface.Interface)
+ at zope.interface.implementer(zope.keyreference.interfaces.IKeyReference)
 class SimpleKeyReference(object):
     """An IReference for all objects. This implementation is *not* ZODB safe.
     """
-    zope.component.adapts(zope.interface.Interface)
-    zope.interface.implements(zope.keyreference.interfaces.IKeyReference)
 
     key_type_id = 'zope.app.keyreference.simple'