Drop support for Python 2.4 and 2.5.

Replace deprecated 'zope.interface.implements' usage with equivalent
'zope.interface.implementer' decorator.

CHANGES.txt

@@ -2,10 +2,13 @@
 CHANGES
 =======
 
-3.6.2 (unreleased)
+4.0.0 (unreleased)
 ------------------
 
-- TBD
+- Replaced deprecated ``zope.interface.implements`` usage with equivalent
+  ``zope.interface.implementer`` decorator.
+
+- Dropped support for Python 2.4 and 2.5.
 
 3.6.1 (2010-05-05)
 ------------------

setup.py

@@ -20,7 +20,7 @@ def read(*rnames):
     return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
 
 setup(name='zope.principalannotation',
-      version = '3.6.2dev',
+      version = '4.0.0dev',
       author='Zope Foundation and Contributors',
       author_email='zope-dev@zope.org',
       description='Annotations for Zope Principals',
@@ -36,6 +36,9 @@ def read(*rnames):
           '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',

src/zope/principalannotation/utility.py

@@ -28,13 +28,12 @@
 
 # TODO: register utility as adapter for IAnnotations on utility activation.
 
+@interface.implementer(IPrincipalAnnotationUtility, IContained)
 class PrincipalAnnotationUtility(Persistent):
     """Stores `IAnnotations` for `IPrinicipals`.
     
     The utility ID is 'PrincipalAnnotation'.
     """
-
-    interface.implements(IPrincipalAnnotationUtility, IContained)
 
     __parent__ = None
     __name__ = None
@@ -66,11 +65,10 @@ def hasAnnotations(self, principal):
         return principal.id in self.annotations
 
 
+@interface.implementer(IAnnotations)
 class Annotations(Persistent, Location):
     """Stores annotations."""
 
-    interface.implements(IAnnotations)
-
     def __init__(self, principalId, store=None):
         self.principalId = principalId
         self.data = PersistentDict() # We don't really expect that many