[Zope3-checkins] CVS: Zope3/src/zope/publisher/tests - test_publisher.py:1.5 test_xmlrpcmethodpublisher.py:1.5

[Steve Alexander]

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

Modified Files:
	test_publisher.py test_xmlrpcmethodpublisher.py 
Log Message:
Removed use of old "from zope.interface.implements ..." api.


=== Zope3/src/zope/publisher/tests/test_publisher.py 1.4 => 1.5 ===
--- Zope3/src/zope/publisher/tests/test_publisher.py:1.4	Fri Apr 11 08:55:41 2003
+++ Zope3/src/zope/publisher/tests/test_publisher.py	Sat Jun  7 02:54:25 2003
@@ -25,7 +25,7 @@
 from zope.publisher.interfaces import IPublication
 
 from zope.interface.verify import verifyClass
-from zope.interface.implements import instancesOfObjectImplements
+from zope.interface import implementedBy
 
 from StringIO import StringIO
 
@@ -80,7 +80,7 @@
                             DefaultPublication(self.app)))
 
     def testInterfacesVerify(self):
-        for interface in instancesOfObjectImplements(DefaultPublication):
+        for interface in implementedBy(DefaultPublication):
             verifyClass(interface, DefaultPublication)
 
     def testTraversalToItem(self):


=== Zope3/src/zope/publisher/tests/test_xmlrpcmethodpublisher.py 1.4 => 1.5 ===
--- Zope3/src/zope/publisher/tests/test_xmlrpcmethodpublisher.py:1.4	Fri Apr 11 08:55:41 2003
+++ Zope3/src/zope/publisher/tests/test_xmlrpcmethodpublisher.py	Sat Jun  7 02:54:25 2003
@@ -17,7 +17,7 @@
 from zope.publisher.interfaces.xmlrpc import IXMLRPCPublisher
 
 from zope.interface.verify import verifyClass
-from zope.interface.implements import instancesOfObjectImplements
+from zope.interface import implementedBy
 
 class ContentStub:
     pass
@@ -36,16 +36,14 @@
         self.failUnless(IXMLRPCPublisher.isImplementedBy(self.pres))
 
     def testInterfacesVerify(self):
-        for interface in instancesOfObjectImplements(Presentation):
+        for interface in implementedBy(Presentation):
             verifyClass(interface, Presentation)
 
     def testXMLRPCTraverseIndex(self):
-        self.assertEquals(self.pres.publishTraverse(None, 'index'),
-            'index')
+        self.assertEquals(self.pres.publishTraverse(None, 'index'), 'index')
 
     def testXMLRPCTraverseAction(self):
-        self.assertEquals(self.pres.publishTraverse(None, 'action'),
-            'action')
+        self.assertEquals(self.pres.publishTraverse(None, 'action'), 'action')
 
     def testXMLRPCTraverseNotFound(self):
         self.failUnlessRaises(AttributeError, self.pres.publishTraverse,