Drop support for Python 2.4 and 2.5.

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

CHANGES.txt

@@ -2,9 +2,14 @@
 CHANGES
 =======
 
-3.7.0 (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.
+
 - Add a new IMatchingPasswordManager interface with a 'match' method, which
   returns True if a given password hash was encdoded with the scheme
   implemented by the specific manager. All managers in this package implement

setup.py

@@ -17,7 +17,7 @@
 
 
 setup(name='zope.password',
-      version='3.7.0dev',
+      version='4.0.0dev',
       author='Zope Foundation and Contributors',
       author_email='zope-dev@zope.org',
       description='Password encoding and checking utilities',
@@ -34,6 +34,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',

src/zope/password/legacy.py

@@ -24,13 +24,14 @@
     # The crypt module is not universally available, apparently
     crypt = None
 
-from zope.interface import implements
+from zope.interface import implementer
 from zope.password.interfaces import IMatchingPasswordManager
 
 _encoder = getencoder("utf-8")
 
 
 if crypt is not None:
+    @implementer(IMatchingPasswordManager)
     class CryptPasswordManager(object):
         """Crypt password manager.
         
@@ -95,7 +96,6 @@ class CryptPasswordManager(object):
 
         """
 
-        implements(IMatchingPasswordManager)
 
         def encodePassword(self, password, salt=None):
             if salt is None:
@@ -113,6 +113,7 @@ def match(self, encoded_password):
             return encoded_password.startswith('{CRYPT}')
 
 
+@implementer(IMatchingPasswordManager)
 class MySQLPasswordManager(object):
     """A MySQL digest manager.
 
@@ -162,7 +163,6 @@ class MySQLPasswordManager(object):
 
     """
 
-    implements(IMatchingPasswordManager)
 
     def encodePassword(self, password):
         nr = 1345345333L

src/zope/password/password.py

@@ -28,12 +28,13 @@
     from md5 import new as md5
     from sha import new as sha1
 
-from zope.interface import implements
+from zope.interface import implementer
 from zope.password.interfaces import IMatchingPasswordManager
 
 _encoder = getencoder("utf-8")
 
 
+@implementer(IMatchingPasswordManager)
 class PlainTextPasswordManager(object):
     """Plain text password manager.
 
@@ -62,7 +63,6 @@ class PlainTextPasswordManager(object):
     False
     """
 
-    implements(IMatchingPasswordManager)
 
     def encodePassword(self, password):
         return password