[Zope3-checkins] CVS: Zope3/src/zope/app/publisher/browser/tests - test_directives.py:1.16 test_globalbrowsermenuservice.py:1.10 test_icondirective.py:1.6

Steve Alexander steve@cat-box.net
Sat, 7 Jun 2003 01:46:34 -0400


Update of /cvs-repository/Zope3/src/zope/app/publisher/browser/tests
In directory cvs.zope.org:/tmp/cvs-serv29577/src/zope/app/publisher/browser/tests

Modified Files:
	test_directives.py test_globalbrowsermenuservice.py 
	test_icondirective.py 
Log Message:
more new-style implements declarations


=== Zope3/src/zope/app/publisher/browser/tests/test_directives.py 1.15 => 1.16 ===
--- Zope3/src/zope/app/publisher/browser/tests/test_directives.py:1.15	Wed May 28 11:46:10 2003
+++ Zope3/src/zope/app/publisher/browser/tests/test_directives.py	Sat Jun  7 01:46:03 2003
@@ -16,7 +16,7 @@
 import unittest
 from cStringIO import StringIO
 
-from zope.interface import Interface
+from zope.interface import Interface, implements
 
 from zope.configuration.xmlconfig import xmlconfig, XMLConfig
 from zope.configuration.exceptions import ConfigurationError
@@ -69,13 +69,13 @@
             return super(VT, self).publishTraverse(request, name)
 
 class Ob:
-    __implements__ = IC
+    implements(IC)
 
 ob = Ob()
 
 class NCV(object):
     "non callable view"
-    
+
     def __init__(self, context, request):
         pass
 
@@ -87,7 +87,7 @@
 
 class C_w_implements(NCV):
 
-    __implements__ = Interface
+    implements(Interface)
 
     def index(self):
         return self


=== Zope3/src/zope/app/publisher/browser/tests/test_globalbrowsermenuservice.py 1.9 => 1.10 ===
--- Zope3/src/zope/app/publisher/browser/tests/test_globalbrowsermenuservice.py:1.9	Thu May  1 15:35:28 2003
+++ Zope3/src/zope/app/publisher/browser/tests/test_globalbrowsermenuservice.py	Sat Jun  7 01:46:03 2003
@@ -21,7 +21,7 @@
 from unittest import TestCase, main, makeSuite
 from zope.publisher.interfaces.browser import IBrowserPublisher
 from zope.exceptions import Forbidden, Unauthorized, DuplicationError
-from zope.interface import Interface
+from zope.interface import Interface, implements
 from zope.publisher.browser import TestRequest
 from zope.app.tests.placelesssetup import PlacelessSetup
 
@@ -37,7 +37,7 @@
 class I111(I11): pass
 
 class X:
-    __implements__ = IBrowserPublisher, I111
+    implements(IBrowserPublisher, I111)
 
     def f(self): pass
 


=== Zope3/src/zope/app/publisher/browser/tests/test_icondirective.py 1.5 => 1.6 ===
--- Zope3/src/zope/app/publisher/browser/tests/test_icondirective.py:1.5	Wed May 28 11:46:10 2003
+++ Zope3/src/zope/app/publisher/browser/tests/test_icondirective.py	Sat Jun  7 01:46:03 2003
@@ -30,6 +30,7 @@
 from zope.component import queryView, getView, getResource
 from zope.configuration.exceptions import ConfigurationError
 import zope.configuration
+from zope.interface import implements
 
 import zope.app.publisher.browser
 
@@ -44,7 +45,7 @@
 request = TestRequest(IBrowserPresentation)
 
 class Ob:
-    __implements__ = IC
+    implements(IC)
 
 ob = Ob()