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

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


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

Changed:
  U   zope.browserpage/trunk/CHANGES.txt
  U   zope.browserpage/trunk/setup.py
  U   zope.browserpage/trunk/src/zope/browserpage/metaconfigure.py
  U   zope.browserpage/trunk/src/zope/browserpage/namedtemplate.py
  U   zope.browserpage/trunk/src/zope/browserpage/simpleviewclass.py
  U   zope.browserpage/trunk/src/zope/browserpage/tests/test_page.py
  U   zope.browserpage/trunk/src/zope/browserpage/tests/test_viewzpt.py

-=-
Modified: zope.browserpage/trunk/CHANGES.txt
===================================================================
--- zope.browserpage/trunk/CHANGES.txt	2012-05-18 12:47:08 UTC (rev 126059)
+++ zope.browserpage/trunk/CHANGES.txt	2012-05-18 12:48:56 UTC (rev 126060)
@@ -2,12 +2,15 @@
 CHANGES
 =======
 
-3.12.3 (unreleased)
+4.0.0 (unreleased)
 ===================
 
-- TBD
+- Replaced deprecated ``zope.interface.implements`` usage with equivalent
+  ``zope.interface.implementer`` decorator.
 
+- Dropped support for Python 2.4 and 2.5.
 
+
 3.12.2 (2010-05-24)
 ===================
 

Modified: zope.browserpage/trunk/setup.py
===================================================================
--- zope.browserpage/trunk/setup.py	2012-05-18 12:47:08 UTC (rev 126059)
+++ zope.browserpage/trunk/setup.py	2012-05-18 12:48:56 UTC (rev 126060)
@@ -19,7 +19,7 @@
                     open('CHANGES.txt').read())
 
 setup(name='zope.browserpage',
-      version = '3.12.3dev',
+      version = '4.0.0dev',
       url='http://pypi.python.org/pypi/zope.browserpage/',
       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.browserpage/trunk/src/zope/browserpage/metaconfigure.py
===================================================================
--- zope.browserpage/trunk/src/zope/browserpage/metaconfigure.py	2012-05-18 12:47:08 UTC (rev 126059)
+++ zope.browserpage/trunk/src/zope/browserpage/metaconfigure.py	2012-05-18 12:48:56 UTC (rev 126060)
@@ -18,7 +18,7 @@
 from zope.component import queryMultiAdapter
 from zope.component.interface import provideInterface
 from zope.component.zcml import handler
-from zope.interface import implements, classImplements, Interface
+from zope.interface import implementer, classImplements, Interface
 from zope.publisher.interfaces import NotFound
 from zope.security.checker import CheckerPublic, Checker, defineChecker
 from zope.configuration.exceptions import ConfigurationError
@@ -408,8 +408,8 @@
             args = ('', for_)
             )
 
+ at implementer(IBrowserPublisher)
 class simple(BrowserView):
-    implements(IBrowserPublisher)
 
     def publishTraverse(self, request, name):
         raise NotFound(self, name, request)

Modified: zope.browserpage/trunk/src/zope/browserpage/namedtemplate.py
===================================================================
--- zope.browserpage/trunk/src/zope/browserpage/namedtemplate.py	2012-05-18 12:47:08 UTC (rev 126059)
+++ zope.browserpage/trunk/src/zope/browserpage/namedtemplate.py	2012-05-18 12:48:56 UTC (rev 126060)
@@ -64,10 +64,9 @@
 
 
 # TODO need test
+ at interface.implementer(zope.traversing.interfaces.IPathAdapter)
 class NamedTemplatePathAdapter(object):
 
-    interface.implements(zope.traversing.interfaces.IPathAdapter)
-
     def __init__(self, context):
         self.context = context
 

Modified: zope.browserpage/trunk/src/zope/browserpage/simpleviewclass.py
===================================================================
--- zope.browserpage/trunk/src/zope/browserpage/simpleviewclass.py	2012-05-18 12:47:08 UTC (rev 126059)
+++ zope.browserpage/trunk/src/zope/browserpage/simpleviewclass.py	2012-05-18 12:48:56 UTC (rev 126060)
@@ -16,16 +16,15 @@
 __docformat__ = 'restructuredtext'
 
 import sys
-from zope.interface import implements
+from zope.interface import implementer
 from zope.publisher.browser import BrowserView
 from zope.publisher.interfaces.browser import IBrowserPublisher
 from zope.publisher.interfaces import NotFound
 from zope.browserpage.viewpagetemplatefile import ViewPageTemplateFile
 
+ at implementer(IBrowserPublisher)
 class simple(BrowserView):
 
-    implements(IBrowserPublisher)
-
     def browserDefault(self, request):
         return self, ()
 

Modified: zope.browserpage/trunk/src/zope/browserpage/tests/test_page.py
===================================================================
--- zope.browserpage/trunk/src/zope/browserpage/tests/test_page.py	2012-05-18 12:47:08 UTC (rev 126059)
+++ zope.browserpage/trunk/src/zope/browserpage/tests/test_page.py	2012-05-18 12:48:56 UTC (rev 126060)
@@ -21,7 +21,7 @@
 from cStringIO import StringIO
 
 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.browserpage/trunk/src/zope/browserpage/tests/test_viewzpt.py
===================================================================
--- zope.browserpage/trunk/src/zope/browserpage/tests/test_viewzpt.py	2012-05-18 12:47:08 UTC (rev 126059)
+++ zope.browserpage/trunk/src/zope/browserpage/tests/test_viewzpt.py	2012-05-18 12:48:56 UTC (rev 126060)
@@ -17,7 +17,7 @@
 
 from zope.component import getGlobalSiteManager
 from zope.component.testing import PlacelessSetup
-from zope.interface import Interface, implements
+from zope.interface import Interface, implementer
 
 from zope.browserpage.viewpagetemplatefile import ViewPageTemplateFile
 
@@ -25,8 +25,9 @@
 class I1(Interface):
     pass
 
+ at implementer(I1)
 class C1(object):
-    implements(I1)
+    pass
 
 class InstanceWithContext(object):
     def __init__(self, context):
@@ -68,8 +69,9 @@
         gsm.registerAdapter(
             ViewMaker, (I1, IRequest), Interface, the_view_name, event=False)
 
+        @implementer(IRequest)
         class MyRequest(object):
-            implements(IRequest)
+            pass
 
         request = MyRequest()
 



More information about the checkins mailing list