[Zope3-checkins] SVN: Zope3/branches/jim-adapter/src/zope/formlib/tests.py Don't need all of zope.app's placelesssetup. zope.component's one is enough,

[Philipp von Weitershausen]

Log message for revision 67140:
  Don't need all of zope.app's placelesssetup. zope.component's one is enough,
  plus zope.i18n's one (which is new).
  

Changed:
  U   Zope3/branches/jim-adapter/src/zope/formlib/tests.py

-=-
Modified: Zope3/branches/jim-adapter/src/zope/formlib/tests.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/formlib/tests.py	2006-04-19 16:02:08 UTC (rev 67139)
+++ Zope3/branches/jim-adapter/src/zope/formlib/tests.py	2006-04-19 16:02:48 UTC (rev 67140)
@@ -19,17 +19,17 @@
 
 from zope import component, interface
 import zope.interface.common.idatetime
-import zope.i18n
+import zope.i18n.testing
 import zope.publisher.interfaces
 import zope.publisher.interfaces.browser
 import zope.schema.interfaces
 import zope.traversing.adapters
+import zope.component.testing
 
 import zope.app.form.browser
 import zope.app.form.browser.exception
 import zope.app.form.browser.interfaces
 import zope.app.form.interfaces
-from zope.app.testing import placelesssetup
 
 from zope.formlib import interfaces, namedtemplate, form
 
@@ -39,7 +39,7 @@
     return pytz.timezone('US/Hawaii')
 
 def pageSetUp(test):
-    placelesssetup.setUp(test)
+    zope.component.testing.setUp(test)
     component.provideAdapter(
         zope.traversing.adapters.DefaultTraversable,
         [None],
@@ -75,7 +75,8 @@
     return '\n'.join(result)
 
 def formSetUp(test):
-    placelesssetup.setUp(test)
+    zope.component.testing.setUp(test)
+    zope.i18n.testing.setUp(test)
     component.provideAdapter(
         zope.app.form.browser.TextWidget,
         [zope.schema.interfaces.ITextLine,
@@ -443,14 +444,14 @@
     return unittest.TestSuite((
         doctest.DocFileSuite(
             'form.txt',
-            setUp=formSetUp, tearDown=placelesssetup.tearDown,
+            setUp=formSetUp, tearDown=zope.component.testing.tearDown,
             ),
         doctest.DocTestSuite(
-            setUp=formSetUp, tearDown=placelesssetup.tearDown,
+            setUp=formSetUp, tearDown=zope.component.testing.tearDown,
             ),
         doctest.DocFileSuite(
             'namedtemplate.txt',
-            setUp=pageSetUp, tearDown=placelesssetup.tearDown,
+            setUp=pageSetUp, tearDown=zope.component.testing.tearDown,
             ),
         ))