[Zope3-checkins] CVS: Zope3/src/zope/app/apidoc/classmodule - __init__.py:1.3 tests.py:1.2

[Stephan Richter]

Update of /cvs-repository/Zope3/src/zope/app/apidoc/classmodule
In directory cvs.zope.org:/tmp/cvs-serv1930/src/zope/app/apidoc/classmodule

Modified Files:
	__init__.py tests.py 
Log Message:
Implemented automatic class registry cleanup.


=== Zope3/src/zope/app/apidoc/classmodule/__init__.py 1.2 => 1.3 ===
--- Zope3/src/zope/app/apidoc/classmodule/__init__.py:1.2	Sun Mar 28 18:39:48 2004
+++ Zope3/src/zope/app/apidoc/classmodule/__init__.py	Sun Mar 28 19:39:55 2004
@@ -513,8 +513,16 @@
         return [(path, klass) for path, klass in self.items()
                 if iface.implementedBy(klass)]
 
-# Initialize the registry
+
 classRegistry = ClassRegistry()
+
+def cleanUp():
+    global classRegistry
+    for key in classRegistry.keys():
+        classRegistry.__delitem__(key)
+
+from zope.testing.cleanup import addCleanUp
+addCleanUp(cleanUp)
 
 
 def safe_import(path, default=None):


=== Zope3/src/zope/app/apidoc/classmodule/tests.py 1.1 => 1.2 ===
--- Zope3/src/zope/app/apidoc/classmodule/tests.py:1.1	Sun Mar 28 18:40:12 2004
+++ Zope3/src/zope/app/apidoc/classmodule/tests.py	Sun Mar 28 19:39:55 2004
@@ -20,8 +20,7 @@
 from zope.publisher.browser import TestRequest
 from zope.testing.doctestunit import DocTestSuite
 from zope.app import zapi
-from zope.app.tests import ztapi
-from zope.app.tests.placelesssetup import setUp, tearDown
+from zope.app.tests import placelesssetup, ztapi
 
 from zope.app.traversing.browser import AbsoluteURL, SiteAbsoluteURL
 from zope.app.traversing.interfaces import ITraversable, ITraverser
@@ -37,8 +36,8 @@
 from zope.app.apidoc.interfaces import IDocumentationModule
 
 
-def browserSetUp():
-    setUp()
+def setUp():
+    placelesssetup.setUp()
     module = ClassModule()
     module.__name__ = ''
     directlyProvides(module, IContainmentRoot)
@@ -57,8 +56,8 @@
     ztapi.browserView(IContainmentRoot, "absolute_url", SiteAbsoluteURL)
 
 
-def browserTearDown():
-    tearDown()
+def tearDown():
+    placelesssetup.tearDown()
 
 
 def getClassDetailsView():
@@ -80,7 +79,7 @@
 def test_suite():
     return unittest.TestSuite((
         DocTestSuite('zope.app.apidoc.classmodule.browser',
-                     setUp=browserSetUp, tearDown=browserTearDown),
+                     setUp=setUp, tearDown=tearDown),
         DocTestSuite('zope.app.apidoc.classmodule'),
         ))