[Checkins] SVN: zope.viewlet/trunk/ Drop support for Python 2.4 and 2.5.
Tres Seaver
cvs-admin at zope.org
Fri May 18 16:30:37 UTC 2012
Log message for revision 126162:
Drop support for Python 2.4 and 2.5.
Replace deprecated 'zope.component.adapts' usage with equivalent
'zope.component.adapter' decorator.
Replace deprecated 'zope.interface.implements' usage with equivalent
'zope.interface.implementer' decorator.
Changed:
U zope.viewlet/trunk/CHANGES.txt
U zope.viewlet/trunk/setup.py
U zope.viewlet/trunk/src/zope/viewlet/README.txt
U zope.viewlet/trunk/src/zope/viewlet/directives.txt
U zope.viewlet/trunk/src/zope/viewlet/manager.py
U zope.viewlet/trunk/src/zope/viewlet/viewlet.py
-=-
Modified: zope.viewlet/trunk/CHANGES.txt
===================================================================
--- zope.viewlet/trunk/CHANGES.txt 2012-05-18 16:23:30 UTC (rev 126161)
+++ zope.viewlet/trunk/CHANGES.txt 2012-05-18 16:30:33 UTC (rev 126162)
@@ -2,12 +2,18 @@
CHANGES
=======
-3.7.3 (unreleased)
+4.0.0 (unreleased)
------------------
--TBD
+- Replaced deprecated ``zope.component.adapts`` usage with equivalent
+ ``zope.component.adapter`` decorator.
+- Replaced deprecated ``zope.interface.implements`` usage with equivalent
+ ``zope.interface.implementer`` decorator.
+- Dropped support for Python 2.4 and 2.5.
+
+
3.7.2 (2010-05-25)
------------------
Modified: zope.viewlet/trunk/setup.py
===================================================================
--- zope.viewlet/trunk/setup.py 2012-05-18 16:23:30 UTC (rev 126161)
+++ zope.viewlet/trunk/setup.py 2012-05-18 16:30:33 UTC (rev 126162)
@@ -25,7 +25,7 @@
return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
setup(name='zope.viewlet',
- version = '3.7.3dev',
+ version = '4.0.0dev',
author='Zope Foundation and Contributors',
author_email='zope-dev at zope.org',
description='Zope Viewlets',
@@ -48,6 +48,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.viewlet/trunk/src/zope/viewlet/README.txt
===================================================================
--- zope.viewlet/trunk/src/zope/viewlet/README.txt 2012-05-18 16:23:30 UTC (rev 126161)
+++ zope.viewlet/trunk/src/zope/viewlet/README.txt 2012-05-18 16:30:33 UTC (rev 126162)
@@ -49,16 +49,17 @@
Now we have to instantiate it:
>>> import zope.interface
- >>> class Content(object):
- ... zope.interface.implements(zope.interface.Interface)
+ >>> @zope.interface.implementer(zope.interface.Interface)
+ ... class Content(object):
+ ... pass
>>> content = Content()
>>> from zope.publisher.browser import TestRequest
>>> request = TestRequest()
>>> from zope.publisher.interfaces.browser import IBrowserView
- >>> class View(object):
- ... zope.interface.implements(IBrowserView)
+ >>> @zope.interface.implementer(IBrowserView)
+ ... class View(object):
... def __init__(self, context, request):
... pass
>>> view = View(content, request)
@@ -76,8 +77,8 @@
>>> import zope.component
>>> from zope.publisher.interfaces.browser import IDefaultBrowserLayer
- >>> class WeatherBox(object):
- ... zope.interface.implements(interfaces.IViewlet)
+ >>> @zope.interface.implementer(interfaces.IViewlet)
+ ... class WeatherBox(object):
...
... def __init__(self, context, request, view, manager):
... self.__parent__ = view
@@ -100,9 +101,9 @@
... interfaces.IViewlet, name='weather')
>>> from zope.location.interfaces import ILocation
- >>> class SportBox(object):
- ... zope.interface.implements(interfaces.IViewlet,
+ >>> @zope.interface.implementer(interfaces.IViewlet,
... ILocation)
+ ... class SportBox(object):
...
... def __init__(self, context, request, view, manager):
... self.__parent__ = view
@@ -695,8 +696,8 @@
>>> class IFile(zope.interface.Interface):
... data = zope.interface.Attribute('Data of file.')
- >>> class File(object):
- ... zope.interface.implements(IFile)
+ >>> @zope.interface.implementer(IFile)
+ ... class File(object):
... def __init__(self, data=''):
... self.__name__ = ''
... self.data = data
@@ -705,9 +706,9 @@
of the ``ISized`` interface:
>>> from zope import size
- >>> class FileSized(object):
- ... zope.interface.implements(size.interfaces.ISized)
- ... zope.component.adapts(IFile)
+ >>> @zope.interface.implementer(size.interfaces.ISized)
+ ... @zope.component.adapter(IFile)
+ ... class FileSized(object):
...
... def __init__(self, file):
... self.file = file
@@ -764,8 +765,8 @@
>>> shownColumns = []
- >>> class ContentsViewletManager(object):
- ... zope.interface.implements(interfaces.IViewletManager)
+ >>> @zope.interface.implementer(interfaces.IViewletManager)
+ ... class ContentsViewletManager(object):
... index = None
...
... def __init__(self, context, request, view):
@@ -1027,16 +1028,16 @@
... def sort(values):
... """Sort the values."""
- >>> class SortByName(object):
- ... zope.interface.implements(ISorter)
+ >>> @zope.interface.implementer(ISorter)
+ ... class SortByName(object):
...
... def sort(self, values):
... return sorted(values, lambda x, y: cmp(x.__name__, y.__name__))
>>> zope.component.provideUtility(SortByName(), name='name')
- >>> class SortBySize(object):
- ... zope.interface.implements(ISorter)
+ >>> @zope.interface.implementer(ISorter)
+ ... class SortBySize(object):
...
... def sort(self, values):
... return sorted(
@@ -1052,8 +1053,8 @@
>>> sortByColumn = ''
- >>> class SortedContentsViewletManager(object):
- ... zope.interface.implements(interfaces.IViewletManager)
+ >>> @zope.interface.implementer(interfaces.IViewletManager)
+ ... class SortedContentsViewletManager(object):
... index = None
...
... def __init__(self, context, request, view):
Modified: zope.viewlet/trunk/src/zope/viewlet/directives.txt
===================================================================
--- zope.viewlet/trunk/src/zope/viewlet/directives.txt 2012-05-18 16:23:30 UTC (rev 126161)
+++ zope.viewlet/trunk/src/zope/viewlet/directives.txt 2012-05-18 16:30:33 UTC (rev 126162)
@@ -30,8 +30,9 @@
objects:
>>> import zope.interface
- >>> class Content(object):
- ... zope.interface.implements(zope.interface.Interface)
+ >>> @zope.interface.implementer(zope.interface.Interface)
+ ... class Content(object):
+ ... pass
>>> content = Content()
>>> from zope.publisher.browser import TestRequest
Modified: zope.viewlet/trunk/src/zope/viewlet/manager.py
===================================================================
--- zope.viewlet/trunk/src/zope/viewlet/manager.py 2012-05-18 16:23:30 UTC (rev 126161)
+++ zope.viewlet/trunk/src/zope/viewlet/manager.py 2012-05-18 16:30:33 UTC (rev 126162)
@@ -25,12 +25,12 @@
from zope.location.interfaces import ILocation
from zope.contentprovider.interfaces import BeforeUpdateEvent
+ at zope.interface.implementer(interfaces.IViewletManager)
class ViewletManagerBase(object):
"""The Viewlet Manager Base
A generic manager class which can be instantiated
"""
- zope.interface.implements(interfaces.IViewletManager)
template = None
def __init__(self, context, request, view):
Modified: zope.viewlet/trunk/src/zope/viewlet/viewlet.py
===================================================================
--- zope.viewlet/trunk/src/zope/viewlet/viewlet.py 2012-05-18 16:23:30 UTC (rev 126161)
+++ zope.viewlet/trunk/src/zope/viewlet/viewlet.py 2012-05-18 16:30:33 UTC (rev 126162)
@@ -25,11 +25,10 @@
from zope.browserpage import simpleviewclass
from zope.browserpage import ViewPageTemplateFile
+ at zope.interface.implementer(interfaces.IViewlet)
class ViewletBase(BrowserView):
"""Viewlet adapter class used in meta directive as a mixin class."""
- zope.interface.implements(interfaces.IViewlet)
-
def __init__(self, context, request, view, manager):
super(ViewletBase, self).__init__(context, request)
self.__parent__ = view
More information about the checkins
mailing list