diff options
| -rw-r--r-- | CHANGES.txt | 7 | ||||
| -rw-r--r-- | setup.py | 5 | ||||
| -rw-r--r-- | src/zope/tal/dummyengine.py | 5 | ||||
| -rw-r--r-- | src/zope/tal/taldefs.py | 4 | ||||
| -rw-r--r-- | src/zope/tal/talgettext.py | 4 |
5 files changed, 17 insertions, 8 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index d67a49b..f047d35 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -2,9 +2,14 @@ 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) ------------------ @@ -44,7 +44,7 @@ def alltests(): return TestSuite(suites) setup(name='zope.tal', - version = '3.6.2dev', + version = '4.0.0dev', author='Zope Foundation and Contributors', author_email='zope-dev@zope.org', description='Zope Template Application Language (TAL)', @@ -60,6 +60,9 @@ setup(name='zope.tal', '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/tal/dummyengine.py b/src/zope/tal/dummyengine.py index 781df0f..ef2d391 100644 --- a/src/zope/tal/dummyengine.py +++ b/src/zope/tal/dummyengine.py @@ -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 @@ name_match = re.compile(r"(?s)(%s):(.*)\Z" % NAME_RE).match class CompilerError(Exception): pass + +@implementer(ITALExpressionCompiler, ITALExpressionEngine) class DummyEngine(object): position = None source_file = None - implements(ITALExpressionCompiler, ITALExpressionEngine) def __init__(self, macros=None): if macros is None: diff --git a/src/zope/tal/taldefs.py b/src/zope/tal/taldefs.py index b8aea12..3ece743 100644 --- a/src/zope/tal/taldefs.py +++ b/src/zope/tal/taldefs.py @@ -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 @@ class I18NError(TALError): pass +@implementer(ITALExpressionErrorInfo) class ErrorInfo(object): - implements(ITALExpressionErrorInfo) def __init__(self, err, position=(None, None)): if isinstance(err, Exception): diff --git a/src/zope/tal/talgettext.py b/src/zope/tal/talgettext.py index 05f13a8..0011755 100644 --- a/src/zope/tal/talgettext.py +++ b/src/zope/tal/talgettext.py @@ -32,7 +32,7 @@ import time 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 @@ class POTALInterpreter(TALInterpreter): default=default, position=self.position) +@implementer(ITALExpressionEngine) class POEngine(DummyEngine): - implements(ITALExpressionEngine) def __init__(self, macros=None): self.catalog = {} |