[Zope3-checkins] CVS: Zope3/src/zope/app/event/tests - test_directives.py:1.13 test_eventpublisher.py:1.7 test_globaleventchannel.py:1.5 test_logger.py:1.12

[Philipp von Weitershausen]

Update of /cvs-repository/Zope3/src/zope/app/event/tests
In directory cvs.zope.org:/tmp/cvs-serv22470/event/tests

Modified Files:
	test_directives.py test_eventpublisher.py 
	test_globaleventchannel.py test_logger.py 
Log Message:
Use super in test setUp methods. We can do this now because TestCase
(finally!) is a new-style class Python 2.3.


=== Zope3/src/zope/app/event/tests/test_directives.py 1.12 => 1.13 ===
--- Zope3/src/zope/app/event/tests/test_directives.py:1.12	Tue Sep 23 15:12:28 2003
+++ Zope3/src/zope/app/event/tests/test_directives.py	Thu Nov 27 08:59:18 2003
@@ -37,7 +37,7 @@
 class Test(PlacelessSetup, TestCase):
 
     def setUp(self):
-        PlacelessSetup.setUp(self)
+        super(Test, self).setUp()
         from zope.app.interfaces.event import IPublisher
         getServiceManager(None).defineService(EventPublication, IPublisher)
         from zope.app.event.globalservice import eventPublisher


=== Zope3/src/zope/app/event/tests/test_eventpublisher.py 1.6 => 1.7 ===
--- Zope3/src/zope/app/event/tests/test_eventpublisher.py:1.6	Mon Nov  3 16:37:59 2003
+++ Zope3/src/zope/app/event/tests/test_eventpublisher.py	Thu Nov 27 08:59:18 2003
@@ -44,7 +44,7 @@
 class TestEventService(PlacelessSetup, unittest.TestCase):
 
     def setUp(self):
-        PlacelessSetup.setUp(self)
+        super(TestEventService, self).setUp()
         self.service = GlobalEventPublisher()
         parent = object()
         self.event = ObjectAddedEvent(None, parent, 'foo')


=== Zope3/src/zope/app/event/tests/test_globaleventchannel.py 1.4 => 1.5 ===
--- Zope3/src/zope/app/event/tests/test_globaleventchannel.py:1.4	Fri Nov 21 12:12:04 2003
+++ Zope3/src/zope/app/event/tests/test_globaleventchannel.py	Thu Nov 27 08:59:18 2003
@@ -123,7 +123,7 @@
         self.ec = GlobalEventChannel()
 
     def setUp(self):
-        PlacelessSetup.setUp(self)
+        super(TestSubscribingAwareChannel, self).setUp()
         self.setUpChannel()
         self.subscriber = SubscriberStub()
         self.filter = lambda x: True
@@ -162,7 +162,7 @@
         raise NotImplementedError('You need to write a setUpChannel method.')
 
     def setUp(self):
-        PlacelessSetup.setUp(self)
+        super(TestAdaptingToISubscriberBase, self).setUp()
         self.setUpChannel()
         self.subscriber = NonSubscriberStub()
         self.event = SomeEvent()


=== Zope3/src/zope/app/event/tests/test_logger.py 1.11 => 1.12 ===
--- Zope3/src/zope/app/event/tests/test_logger.py:1.11	Sun Sep 21 13:32:09 2003
+++ Zope3/src/zope/app/event/tests/test_logger.py	Thu Nov 27 08:59:18 2003
@@ -40,7 +40,7 @@
     eventlogger = Logger()
 
     def setUp(self):
-        PlacelessSetup.setUp(self)
+        super(TestLogger1, self).setUp()
         from zope.app.interfaces.event import IPublisher
         getServiceManager(None).defineService(EventPublication, IPublisher)
         from zope.app.event.globalservice import eventPublisher