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

Tres Seaver cvs-admin at zope.org
Fri May 18 12:37:11 UTC 2012


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

Changed:
  U   zope.browsermenu/trunk/CHANGES.txt
  U   zope.browsermenu/trunk/setup.py
  U   zope.browsermenu/trunk/src/zope/browsermenu/README.txt
  U   zope.browsermenu/trunk/src/zope/browsermenu/menu.py
  U   zope.browsermenu/trunk/src/zope/browsermenu/tests/test_directives.py
  U   zope.browsermenu/trunk/src/zope/browsermenu/tests/test_menudirectives.py

-=-
Modified: zope.browsermenu/trunk/CHANGES.txt
===================================================================
--- zope.browsermenu/trunk/CHANGES.txt	2012-05-18 12:34:23 UTC (rev 126054)
+++ zope.browsermenu/trunk/CHANGES.txt	2012-05-18 12:37:08 UTC (rev 126055)
@@ -2,10 +2,15 @@
 CHANGES
 =======
 
-3.9.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.9.1 (2010-04-30)
 ==================
 

Modified: zope.browsermenu/trunk/setup.py
===================================================================
--- zope.browsermenu/trunk/setup.py	2012-05-18 12:34:23 UTC (rev 126054)
+++ zope.browsermenu/trunk/setup.py	2012-05-18 12:37:08 UTC (rev 126055)
@@ -19,7 +19,7 @@
                     open('CHANGES.txt').read())
 
 setup(name='zope.browsermenu',
-      version = '3.9.2dev',
+      version = '4.0.0dev',
       url='http://pypi.python.org/pypi/zope.browsermenu/',
       author='Zope Foundation and Contributors',
       author_email='zope-dev at zope.org',
@@ -27,6 +27,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',
                      'Operating System :: OS Independent',
                      'Topic :: Internet :: WWW/HTTP',
                      'Framework :: Zope3',

Modified: zope.browsermenu/trunk/src/zope/browsermenu/README.txt
===================================================================
--- zope.browsermenu/trunk/src/zope/browsermenu/README.txt	2012-05-18 12:34:23 UTC (rev 126054)
+++ zope.browsermenu/trunk/src/zope/browsermenu/README.txt	2012-05-18 12:37:08 UTC (rev 126055)
@@ -49,8 +49,8 @@
   >>> from zope.publisher.interfaces.browser import IBrowserPublisher
   >>> from zope.security.interfaces import Unauthorized, Forbidden
 
-  >>> class Content(object):
-  ...     zope.interface.implements(IContent, IBrowserPublisher)
+  >>> @zope.interface.implementer(IContent, IBrowserPublisher)
+  ... class Content(object):
   ...
   ...     def foo(self):
   ...         pass
@@ -356,8 +356,8 @@
 
   >>> from zope.browsermenu.interfaces import IBrowserMenu
 
-  >>> class Items(object):
-  ...     zope.interface.implements(IBrowserMenu)
+  >>> @zope.interface.implementer(IBrowserMenu)
+  ... class Items(object):
   ...  
   ...     def __init__(self, id, title=u'', description=u''):
   ...         self.id = id

Modified: zope.browsermenu/trunk/src/zope/browsermenu/menu.py
===================================================================
--- zope.browsermenu/trunk/src/zope/browsermenu/menu.py	2012-05-18 12:34:23 UTC (rev 126054)
+++ zope.browsermenu/trunk/src/zope/browsermenu/menu.py	2012-05-18 12:37:08 UTC (rev 126055)
@@ -17,7 +17,7 @@
 import sys
 
 from zope.component import getAdapters, getUtility
-from zope.interface import Interface, implements, providedBy
+from zope.interface import Interface, implementer, providedBy
 from zope.interface.interfaces import IInterface
 from zope.pagetemplate.engine import Engine
 from zope.publisher.browser import BrowserView
@@ -30,9 +30,9 @@
 from zope.browsermenu.interfaces import IBrowserMenuItem, IBrowserSubMenuItem
 from zope.browsermenu.interfaces import IMenuAccessView
 
+ at implementer(IBrowserMenu)
 class BrowserMenu(object):
     """Browser Menu"""
-    implements(IBrowserMenu)
 
     def __init__(self, id, title=u'', description=u''):
         self.id = id
@@ -87,9 +87,9 @@
         return result
 
 
+ at implementer(IBrowserMenuItem)
 class BrowserMenuItem(BrowserView):
     """Browser Menu Item Class"""
-    implements(IBrowserMenuItem)
 
     title = u''
     description = u''
@@ -163,9 +163,9 @@
         return False
 
 
+ at implementer(IBrowserSubMenuItem)
 class BrowserSubMenuItem(BrowserMenuItem):
     """Browser Menu Item Base Class"""
-    implements(IBrowserSubMenuItem)
 
     submenuId = None
 
@@ -189,9 +189,9 @@
     return None
 
 
+ at implementer(IMenuAccessView)
 class MenuAccessView(BrowserView):
     """A view allowing easy access to menus."""
-    implements(IMenuAccessView)
 
     def __getitem__(self, menuId):
         return getMenu(menuId, self.context, self.request)

Modified: zope.browsermenu/trunk/src/zope/browsermenu/tests/test_directives.py
===================================================================
--- zope.browsermenu/trunk/src/zope/browsermenu/tests/test_directives.py	2012-05-18 12:34:23 UTC (rev 126054)
+++ zope.browsermenu/trunk/src/zope/browsermenu/tests/test_directives.py	2012-05-18 12:37:08 UTC (rev 126055)
@@ -21,7 +21,7 @@
 from doctest import DocTestSuite
 
 from zope import component
-from zope.interface import Interface, implements, directlyProvides, providedBy
+from zope.interface import Interface, implementer, directlyProvides, providedBy
 
 import zope.security.management
 from zope.configuration.xmlconfig import xmlconfig, XMLConfig
@@ -74,8 +74,9 @@
         except:
             return super(VT, self).publishTraverse(request, name)
 
+ at implementer(IC)
 class Ob(object):
-    implements(IC)
+    pass
 
 ob = Ob()
 
@@ -91,8 +92,8 @@
         pass
 
 
+ at implementer(Interface)
 class C_w_implements(NCV):
-    implements(Interface)
 
     def index(self):
         return self

Modified: zope.browsermenu/trunk/src/zope/browsermenu/tests/test_menudirectives.py
===================================================================
--- zope.browsermenu/trunk/src/zope/browsermenu/tests/test_menudirectives.py	2012-05-18 12:34:23 UTC (rev 126054)
+++ zope.browsermenu/trunk/src/zope/browsermenu/tests/test_menudirectives.py	2012-05-18 12:37:08 UTC (rev 126055)
@@ -16,7 +16,7 @@
 import unittest
 
 from zope.configuration.xmlconfig import XMLConfig
-from zope.interface import Interface, implements
+from zope.interface import Interface, implementer
 from zope.publisher.browser import TestRequest
 from zope.publisher.interfaces.browser import IBrowserPublisher
 from zope.publisher.interfaces.browser import IDefaultBrowserLayer
@@ -44,16 +44,18 @@
 class I111(I11): pass
 
 
+ at implementer(I1)
 class C1(object):
-    implements(I1)
+    pass
 
 class I2(Interface): pass
 
+ at implementer(I2)
 class C2(object):
-    implements(I2)
+    pass
 
+ at implementer(IBrowserPublisher, I111)
 class TestObject(object):
-    implements(IBrowserPublisher, I111)
 
     def f(self):
         pass



More information about the checkins mailing list