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

[Tres Seaver]

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

Changed:
  U   zope.tal/trunk/CHANGES.txt
  U   zope.tal/trunk/setup.py
  U   zope.tal/trunk/src/zope/tal/dummyengine.py
  U   zope.tal/trunk/src/zope/tal/taldefs.py
  U   zope.tal/trunk/src/zope/tal/talgettext.py

-=-
Modified: zope.tal/trunk/CHANGES.txt
===================================================================
--- zope.tal/trunk/CHANGES.txt	2012-05-17 23:01:48 UTC (rev 126010)
+++ zope.tal/trunk/CHANGES.txt	2012-05-17 23:05:23 UTC (rev 126011)
@@ -2,10 +2,15 @@
 CHANGES
 =======
 
-3.6.2 (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.
+
+
 3.6.1 (2012-03-09)
 ------------------
 

Modified: zope.tal/trunk/setup.py
===================================================================
--- zope.tal/trunk/setup.py	2012-05-17 23:01:48 UTC (rev 126010)
+++ zope.tal/trunk/setup.py	2012-05-17 23:05:23 UTC (rev 126011)
@@ -44,7 +44,7 @@
     return TestSuite(suites)
 
 setup(name='zope.tal',
-      version = '3.6.2dev',
+      version = '4.0.0dev',
       author='Zope Foundation and Contributors',
       author_email='zope-dev at zope.org',
       description='Zope Template Application Language (TAL)',
@@ -60,6 +60,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.tal/trunk/src/zope/tal/dummyengine.py
===================================================================
--- zope.tal/trunk/src/zope/tal/dummyengine.py	2012-05-17 23:01:48 UTC (rev 126010)
+++ zope.tal/trunk/src/zope/tal/dummyengine.py	2012-05-17 23:05:23 UTC (rev 126011)
@@ -15,7 +15,7 @@
 """
 import re
 
-from zope.interface import implements
+from zope.interface import implementer
 from zope.tal.taldefs import NAME_RE, TALExpressionError, ErrorInfo
 from zope.tal.interfaces import ITALExpressionCompiler, ITALExpressionEngine
 from zope.i18nmessageid import Message
@@ -27,12 +27,13 @@
 class CompilerError(Exception):
     pass
 
+
+ at implementer(ITALExpressionCompiler, ITALExpressionEngine)
 class DummyEngine(object):
 
     position = None
     source_file = None
 
-    implements(ITALExpressionCompiler, ITALExpressionEngine)
 
     def __init__(self, macros=None):
         if macros is None:

Modified: zope.tal/trunk/src/zope/tal/taldefs.py
===================================================================
--- zope.tal/trunk/src/zope/tal/taldefs.py	2012-05-17 23:01:48 UTC (rev 126010)
+++ zope.tal/trunk/src/zope/tal/taldefs.py	2012-05-17 23:05:23 UTC (rev 126011)
@@ -15,7 +15,7 @@
 """
 import re
 from zope.tal.interfaces import ITALExpressionErrorInfo
-from zope.interface import implements
+from zope.interface import implementer
 
 
 TAL_VERSION = "1.6"
@@ -95,8 +95,8 @@
     pass
 
 
+ at implementer(ITALExpressionErrorInfo)
 class ErrorInfo(object):
-    implements(ITALExpressionErrorInfo)
 
     def __init__(self, err, position=(None, None)):
         if isinstance(err, Exception):

Modified: zope.tal/trunk/src/zope/tal/talgettext.py
===================================================================
--- zope.tal/trunk/src/zope/tal/talgettext.py	2012-05-17 23:01:48 UTC (rev 126010)
+++ zope.tal/trunk/src/zope/tal/talgettext.py	2012-05-17 23:05:23 UTC (rev 126011)
@@ -32,7 +32,7 @@
 import getopt
 import traceback
 
-from zope.interface import implements
+from zope.interface import implementer
 from zope.tal.htmltalparser import HTMLTALParser
 from zope.tal.talinterpreter import TALInterpreter, normalize
 from zope.tal.dummyengine import DummyEngine
@@ -86,8 +86,8 @@
                                      default=default, position=self.position)
 
 
+ at implementer(ITALExpressionEngine)
 class POEngine(DummyEngine):
-    implements(ITALExpressionEngine)
 
     def __init__(self, macros=None):
         self.catalog = {}