[Zodb-checkins] CVS: Zope3/src/zope/testing - functional.py:1.18

[Philipp von Weitershausen]

Update of /cvs-repository/Zope3/src/zope/testing
In directory cvs.zope.org:/tmp/cvs-serv11938/src/zope/testing

Modified Files:
	functional.py 
Log Message:
Use python 2.3 features: booleans, super.


=== Zope3/src/zope/testing/functional.py 1.17 => 1.18 ===
--- Zope3/src/zope/testing/functional.py:1.17	Fri Feb 20 11:57:37 2004
+++ Zope3/src/zope/testing/functional.py	Mon Feb 23 05:20:23 2004
@@ -28,14 +28,15 @@
 from transaction import get_transaction
 from ZODB.DB import DB
 from ZODB.DemoStorage import DemoStorage
-from zope.app import Application
-from zope.app.publication.zopepublication import ZopePublication
-from zope.app.publication.http import HTTPPublication
 from zope.publisher.browser import BrowserRequest
 from zope.publisher.http import HTTPRequest
 from zope.publisher.publish import publish
 from zope.exceptions import Forbidden, Unauthorized
 
+from zope.app import Application
+from zope.app.publication.zopepublication import ZopePublication
+from zope.app.publication.http import HTTPPublication
+
 __metaclass__ = type
 
 
@@ -96,7 +97,7 @@
             self.app = Application(self.db, config_file)
             self.connection = None
             self._config_file = config_file
-            self._init = 1
+            self._init = True
         elif config_file and config_file != self._config_file:
             # Running different tests with different configurations is not
             # supported at the moment
@@ -135,13 +136,13 @@
 
     def setUp(self):
         """Prepares for a functional test case."""
-        unittest.TestCase.setUp(self)
+        super(FunctionalTestCase, self).setUp()
         FunctionalTestSetup().setUp()
 
     def tearDown(self):
         """Cleans up after a functional test case."""
         FunctionalTestSetup().tearDown()
-        unittest.TestCase.tearDown(self)
+        super(FunctionalTestCase, self).tearDown()
 
     def getRootFolder(self):
         """Returns the Zope root folder."""