[Checkins] SVN: zope.component/tseaver-test_cleanup/ Make zope.testing dependency soft.

[Tres Seaver]

Log message for revision 127136:
  Make zope.testing dependency soft.

Changed:
  _U  zope.component/tseaver-test_cleanup/
  U   zope.component/tseaver-test_cleanup/src/zope/component/eventtesting.py
  U   zope.component/tseaver-test_cleanup/src/zope/component/testing.py
  U   zope.component/tseaver-test_cleanup/src/zope/component/testlayer.py

-=-
Modified: zope.component/tseaver-test_cleanup/src/zope/component/eventtesting.py
===================================================================
--- zope.component/tseaver-test_cleanup/src/zope/component/eventtesting.py	2012-06-27 15:44:03 UTC (rev 127135)
+++ zope.component/tseaver-test_cleanup/src/zope/component/eventtesting.py	2012-06-27 16:08:33 UTC (rev 127136)
@@ -20,7 +20,11 @@
 from zope.component.registry import (
     dispatchSubscriptionAdapterRegistrationEvent)
 from zope.component.registry import dispatchHandlerRegistrationEvent
-from zope.testing import cleanup
+try:
+    from zope.testing.cleanup import addCleanUp
+except ImportError:
+    def addCleanUp(x):
+        pass
 
 events = []
 def getEvents(event_type=None, filter=None): #pragma NO COVER going aaway
@@ -36,7 +40,7 @@
 
 def clearEvents(): #pragma NO COVER going aaway
     del events[:]
-cleanup.addCleanUp(clearEvents)
+addCleanUp(clearEvents)
 
 class PlacelessSetup: #pragma NO COVER going aaway
 

Modified: zope.component/tseaver-test_cleanup/src/zope/component/testing.py
===================================================================
--- zope.component/tseaver-test_cleanup/src/zope/component/testing.py	2012-06-27 15:44:03 UTC (rev 127135)
+++ zope.component/tseaver-test_cleanup/src/zope/component/testing.py	2012-06-27 16:08:33 UTC (rev 127136)
@@ -18,7 +18,17 @@
 import zope.component.event
 
 # we really don't need special setup now:
-from zope.testing.cleanup import CleanUp as PlacelessSetup
+try:
+    from zope.testing.cleanup import CleanUp as PlacelessSetup
+except ImportError:
+    class PlacelessSetup(object):
+        def cleanUp(self):
+            from zope.component.globalregistry import base
+            base.__init__('base')
+        def setUp(self):
+            self.cleanUp()
+        def tearDown(self):
+            self.cleanUp()
 
 def setUp(test=None):
     PlacelessSetup().setUp()

Modified: zope.component/tseaver-test_cleanup/src/zope/component/testlayer.py
===================================================================
--- zope.component/tseaver-test_cleanup/src/zope/component/testlayer.py	2012-06-27 15:44:03 UTC (rev 127135)
+++ zope.component/tseaver-test_cleanup/src/zope/component/testlayer.py	2012-06-27 16:08:33 UTC (rev 127136)
@@ -15,7 +15,12 @@
 import os
 
 from zope.configuration import xmlconfig, config
-from zope.testing.cleanup import cleanUp
+try:
+    from zope.testing.cleanup import cleanUp
+except ImportError:
+    def cleanUp():
+        pass
+
 from zope.component import provideHandler
 from zope.component.hooks import setHooks
 from zope.component.eventtesting import events, clearEvents