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

[Tres Seaver]

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

Changed:
  U   zope.intid/trunk/CHANGES.txt
  U   zope.intid/trunk/setup.py
  U   zope.intid/trunk/src/zope/intid/__init__.py
  U   zope.intid/trunk/src/zope/intid/interfaces.py
  U   zope.intid/trunk/src/zope/intid/tests.py

-=-
Modified: zope.intid/trunk/CHANGES.txt
===================================================================
--- zope.intid/trunk/CHANGES.txt	2012-05-18 13:09:05 UTC (rev 126078)
+++ zope.intid/trunk/CHANGES.txt	2012-05-18 13:11:38 UTC (rev 126079)
@@ -2,9 +2,14 @@
 CHANGES
 =======
 
-3.7.3 (unreleased)
+4.0.0 (unreleased)
 ------------------
 
+- Replaced deprecated ``zope.interface.implements`` usage with equivalent
+  ``zope.interface.implementer`` decorator.
+
+- Dropped support for Python 2.4 and 2.5.
+
 - Bug fix: ensure that the IntId utility never generates ids greater
   than the maxint of the BTree family being used.
 

Modified: zope.intid/trunk/setup.py
===================================================================
--- zope.intid/trunk/setup.py	2012-05-18 13:09:05 UTC (rev 126078)
+++ zope.intid/trunk/setup.py	2012-05-18 13:11:38 UTC (rev 126079)
@@ -25,7 +25,7 @@
     return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
 
 setup(name = 'zope.intid',
-      version = '3.7.3dev',
+      version = '4.0.0dev',
       author='Albertas Agejevas and Gintautas Miliauskas',
       maintainer='Zope developers',
       maintainer_email='zope-dev at zope.org',
@@ -42,6 +42,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.intid/trunk/src/zope/intid/__init__.py
===================================================================
--- zope.intid/trunk/src/zope/intid/__init__.py	2012-05-18 13:09:05 UTC (rev 126078)
+++ zope.intid/trunk/src/zope/intid/__init__.py	2012-05-18 13:11:38 UTC (rev 126079)
@@ -24,7 +24,7 @@
 from persistent import Persistent
 from zope.component import adapter, getAllUtilitiesRegisteredFor, subscribers
 from zope.event import notify
-from zope.interface import implements
+from zope.interface import implementer
 from zope.keyreference.interfaces import IKeyReference, NotYet
 from zope.lifecycleevent.interfaces import IObjectAddedEvent
 from zope.lifecycleevent.interfaces import IObjectRemovedEvent
@@ -35,13 +35,13 @@
 from zope.intid.interfaces import IIntIds, IIntIdEvent
 from zope.intid.interfaces import IntIdAddedEvent, IntIdRemovedEvent
 
+ at implementer(IIntIds, IContained)
 class IntIds(Persistent):
     """This utility provides a two way mapping between objects and
     integer ids.
 
     IKeyReferences to objects are stored in the indexes.
     """
-    implements(IIntIds, IContained)
 
     __parent__ = __name__ = None
 

Modified: zope.intid/trunk/src/zope/intid/interfaces.py
===================================================================
--- zope.intid/trunk/src/zope/intid/interfaces.py	2012-05-18 13:09:05 UTC (rev 126078)
+++ zope.intid/trunk/src/zope/intid/interfaces.py	2012-05-18 13:11:38 UTC (rev 126079)
@@ -1,6 +1,6 @@
 """Interfaces for the unique id utility.
 """
-from zope.interface import Interface, Attribute, implements
+from zope.interface import Interface, Attribute, implementer
 
 
 class IIntIdsQuery(Interface):
@@ -77,13 +77,12 @@
     """
 
 
+ at implementer(IIntIdRemovedEvent)
 class IntIdRemovedEvent(object):
     """The event which is published before the unique id is removed
     from the utility so that the catalogs can unindex the object.
     """
 
-    implements(IIntIdRemovedEvent)
-
     def __init__(self, object, event):
         self.object = object
         self.original_event = event
@@ -99,13 +98,12 @@
     idmap = Attribute("The dictionary that holds an (utility -> id) mapping of created ids")
 
 
+ at implementer(IIntIdAddedEvent)
 class IntIdAddedEvent(object):
     """The event which gets sent when an object is registered in a
     unique id utility.
     """
 
-    implements(IIntIdAddedEvent)
-
     def __init__(self, object, event, idmap=None):
         self.object = object
         self.original_event = event

Modified: zope.intid/trunk/src/zope/intid/tests.py
===================================================================
--- zope.intid/trunk/src/zope/intid/tests.py	2012-05-18 13:09:05 UTC (rev 126078)
+++ zope.intid/trunk/src/zope/intid/tests.py	2012-05-18 13:11:38 UTC (rev 126079)
@@ -25,7 +25,7 @@
 from zope.component import provideHandler
 from zope.component import testing, eventtesting
 from zope.component.interfaces import ISite, IComponentLookup
-from zope.interface import implements, Interface
+from zope.interface import implementer, Interface
 from zope.interface.verify import verifyObject
 from zope.keyreference.persistent import KeyReferenceToPersistent
 from zope.keyreference.persistent import connectionOfPersistent
@@ -67,8 +67,9 @@
     return api.traverse(folder, "++etc++site")
 
 
+ at implementer(ILocation)
 class P(Persistent):
-    implements(ILocation)
+    pass
 
 
 class ConnectionStub(object):