Drop support for Python 2.4 and 2.5.

Replace 'zope.interface.classProvides' usage with equivalent
'zope.interface.provider' decorator.

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

4 files changed, 23 insertions, 13 deletions

diff --git a/CHANGES.txt b/CHANGES.txt
index 32a183b..d372632 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,9 +2,17 @@
 CHANGES
 =======
 
-3.6.4 (unreleased)
+4.0.0 (unreleased)
 ------------------
 
+- Replaced deprecated ``zope.interface.classProvides`` usage with equivalent
+  ``zope.interface.provider`` decorator.
+
+- Replaced deprecated ``zope.interface.implements`` usage with equivalent
+  ``zope.interface.implementer`` decorator.
+
+- Dropped support for Python 2.4 and 2.5.
+
 
 3.6.3 (2011-09-21)
 ------------------
diff --git a/setup.py b/setup.py
index f1c43c7..748e13b 100644
--- a/setup.py
+++ b/setup.py
@@ -27,7 +27,7 @@ def read(*rnames):
 
 
 setup(name='zope.pagetemplate',
-      version='3.6.4dev',
+      version='4.0.0dev',
       author='Zope Foundation and Contributors',
       author_email='zope-dev@zope.org',
       description='Zope Page Templates',
@@ -49,6 +49,9 @@ setup(name='zope.pagetemplate',
           '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',
diff --git a/src/zope/pagetemplate/engine.py b/src/zope/pagetemplate/engine.py
index e530802..3e68c46 100644
--- a/src/zope/pagetemplate/engine.py
+++ b/src/zope/pagetemplate/engine.py
@@ -20,7 +20,7 @@ __docformat__ = 'restructuredtext'
 import sys
 
 from zope import component
-from zope.interface import implements
+from zope.interface import implementer
 from zope.component.interfaces import ComponentLookupError
 from zope.traversing.interfaces import IPathAdapter, ITraversable
 from zope.traversing.interfaces import TraversalError
@@ -322,8 +322,8 @@ class ZopeEngine(ZopeBaseEngine):
       >>> from zope.component.testing import setUp, tearDown
       >>> from zope.security.checker import NamesChecker, defineChecker
 
-      >>> class Container(dict):
-      ...     implements(ITraversable)
+      >>> @implementer(ITraversable)
+      ... class Container(dict):
       ...     def traverse(self, name, further_path):
       ...         return self[name]
 
@@ -418,10 +418,9 @@ class TrustedZopeEngine(ZopeBaseEngine):
     _create_context = TrustedZopeContext
 
 
+@implementer(ITraversable)
 class TraversableModuleImporter(SimpleModuleImporter):
 
-    implements(ITraversable)
-
     def traverse(self, name, further_path):
         try:
             return self[name]
diff --git a/src/zope/pagetemplate/pagetemplate.py b/src/zope/pagetemplate/pagetemplate.py
index 9491885..9275737 100644
--- a/src/zope/pagetemplate/pagetemplate.py
+++ b/src/zope/pagetemplate/pagetemplate.py
@@ -26,8 +26,8 @@ from zope.component import queryUtility
 from zope.pagetemplate.interfaces import IPageTemplateSubclassing
 from zope.pagetemplate.interfaces import IPageTemplateEngine
 from zope.pagetemplate.interfaces import IPageTemplateProgram
-from zope.interface import implements
-from zope.interface import classProvides
+from zope.interface import implementer
+from zope.interface import provider
 
 _default_options = {}
 _error_start = '<!-- Page Template Diagnostics'
@@ -47,6 +47,7 @@ class StringIO(list):
         return u''.join(self)
 
 
+@implementer(IPageTemplateSubclassing)
 class PageTemplate(object):
     """Page Templates using TAL, TALES, and METAL.
 
@@ -72,7 +73,6 @@ class PageTemplate(object):
         to perform the rendering.
     """
 
-    implements(IPageTemplateSubclassing)
 
     content_type = 'text/html'
     expand = 1
@@ -222,11 +222,11 @@ class PTRuntimeError(RuntimeError):
     pass
 
 
+@implementer(IPageTemplateProgram)
+@provider(IPageTemplateEngine)
 class PageTemplateEngine(object):
     """Page template engine that uses the TAL interpreter to render."""
 
-    implements(IPageTemplateProgram)
-    classProvides(IPageTemplateEngine)
 
     def __init__(self, program):
         self.program = program
@@ -255,8 +255,8 @@ class PageTemplateEngine(object):
         return cls(program), macros
 
 
+#@implementer(ITracebackSupplement)
 class PageTemplateTracebackSupplement(object):
-    #implements(ITracebackSupplement)
 
     def __init__(self, pt, namespace):
         self.manageable_object = pt