[Checkins] SVN: zope.pagetemplate/trunk/ Drop support for Python 2.4 and 2.5.
Tres Seaver
cvs-admin at zope.org
Thu May 17 23:17:57 UTC 2012
Log message for revision 126016:
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.
Changed:
U zope.pagetemplate/trunk/CHANGES.txt
U zope.pagetemplate/trunk/setup.py
U zope.pagetemplate/trunk/src/zope/pagetemplate/engine.py
U zope.pagetemplate/trunk/src/zope/pagetemplate/pagetemplate.py
-=-
Modified: zope.pagetemplate/trunk/CHANGES.txt
===================================================================
--- zope.pagetemplate/trunk/CHANGES.txt 2012-05-17 23:16:45 UTC (rev 126015)
+++ zope.pagetemplate/trunk/CHANGES.txt 2012-05-17 23:17:53 UTC (rev 126016)
@@ -2,10 +2,18 @@
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)
------------------
Modified: zope.pagetemplate/trunk/setup.py
===================================================================
--- zope.pagetemplate/trunk/setup.py 2012-05-17 23:16:45 UTC (rev 126015)
+++ zope.pagetemplate/trunk/setup.py 2012-05-17 23:17:53 UTC (rev 126016)
@@ -27,7 +27,7 @@
setup(name='zope.pagetemplate',
- version='3.6.4dev',
+ version='4.0.0dev',
author='Zope Foundation and Contributors',
author_email='zope-dev at zope.org',
description='Zope Page Templates',
@@ -49,6 +49,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.pagetemplate/trunk/src/zope/pagetemplate/engine.py
===================================================================
--- zope.pagetemplate/trunk/src/zope/pagetemplate/engine.py 2012-05-17 23:16:45 UTC (rev 126015)
+++ zope.pagetemplate/trunk/src/zope/pagetemplate/engine.py 2012-05-17 23:17:53 UTC (rev 126016)
@@ -20,7 +20,7 @@
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 @@
>>> 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 @@
_create_context = TrustedZopeContext
+ at implementer(ITraversable)
class TraversableModuleImporter(SimpleModuleImporter):
- implements(ITraversable)
-
def traverse(self, name, further_path):
try:
return self[name]
Modified: zope.pagetemplate/trunk/src/zope/pagetemplate/pagetemplate.py
===================================================================
--- zope.pagetemplate/trunk/src/zope/pagetemplate/pagetemplate.py 2012-05-17 23:16:45 UTC (rev 126015)
+++ zope.pagetemplate/trunk/src/zope/pagetemplate/pagetemplate.py 2012-05-17 23:17:53 UTC (rev 126016)
@@ -26,8 +26,8 @@
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 @@
return u''.join(self)
+ at implementer(IPageTemplateSubclassing)
class PageTemplate(object):
"""Page Templates using TAL, TALES, and METAL.
@@ -72,7 +73,6 @@
to perform the rendering.
"""
- implements(IPageTemplateSubclassing)
content_type = 'text/html'
expand = 1
@@ -222,11 +222,11 @@
pass
+ at implementer(IPageTemplateProgram)
+ at 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 @@
return cls(program), macros
+#@implementer(ITracebackSupplement)
class PageTemplateTracebackSupplement(object):
- #implements(ITracebackSupplement)
def __init__(self, pt, namespace):
self.manageable_object = pt
More information about the checkins
mailing list