[Checkins] SVN: zc.form/trunk/src/zc/form/browser/ Get rid of unit test deprecations

[Gary Poster]

Log message for revision 67685:
  Get rid of unit test deprecations
  

Changed:
  U   zc.form/trunk/src/zc/form/browser/exceptionviews.py
  U   zc.form/trunk/src/zc/form/browser/tests.py
  U   zc.form/trunk/src/zc/form/browser/widgetapi.py

-=-
Modified: zc.form/trunk/src/zc/form/browser/exceptionviews.py
===================================================================
--- zc.form/trunk/src/zc/form/browser/exceptionviews.py	2006-04-28 03:26:06 UTC (rev 67684)
+++ zc.form/trunk/src/zc/form/browser/exceptionviews.py	2006-04-28 03:26:21 UTC (rev 67685)
@@ -21,7 +21,7 @@
 from cgi import escape
 from zope.schema.interfaces import ValidationError
 from zope.app.form.interfaces import ConversionError
-from zope.app.exception.interfaces import UserError
+from zope.exceptions.interfaces import UserError
 
 class AbstractErrorView(object):
     interface.implements(IWidgetInputErrorView)

Modified: zc.form/trunk/src/zc/form/browser/tests.py
===================================================================
--- zc.form/trunk/src/zc/form/browser/tests.py	2006-04-28 03:26:06 UTC (rev 67684)
+++ zc.form/trunk/src/zc/form/browser/tests.py	2006-04-28 03:26:21 UTC (rev 67685)
@@ -20,13 +20,13 @@
 
 from zope.testing import doctest, module
 from zope.app.testing import placelesssetup
-import zope.app.traversing.adapters
+import zope.traversing.adapters
 
 from zope.interface import implements
 from zope.schema.interfaces import ValidationError
 from zope.schema import TextLine, Int
 from zope.publisher.interfaces.browser import IBrowserRequest
-from zope.app.tests import ztapi
+from zope.app.testing import ztapi
 from zope.app.form.browser.textwidgets import TextWidget, IntWidget
 from zope.schema.interfaces import ITextLine, IInt
 from zope.app.form.interfaces import IInputWidget
@@ -57,7 +57,7 @@
         from zc.form.browser.unionwidget import default_template
         component.provideAdapter(default_template, name='default')
         component.provideAdapter(
-            zope.app.traversing.adapters.DefaultTraversable,
+            zope.traversing.adapters.DefaultTraversable,
             [None],
             )
 
@@ -128,7 +128,7 @@
 def pageSetUp(test):
     placelesssetup.setUp(test)
     component.provideAdapter(
-        zope.app.traversing.adapters.DefaultTraversable,
+        zope.traversing.adapters.DefaultTraversable,
         [None],
         )
 

Modified: zc.form/trunk/src/zc/form/browser/widgetapi.py
===================================================================
--- zc.form/trunk/src/zc/form/browser/widgetapi.py	2006-04-28 03:26:06 UTC (rev 67684)
+++ zc.form/trunk/src/zc/form/browser/widgetapi.py	2006-04-28 03:26:21 UTC (rev 67685)
@@ -20,7 +20,6 @@
 from xml.sax.saxutils import escape, quoteattr
 
 from zope.interface import implements
-from zope.component import getService
 from zope.schema.interfaces import ValidationError
 
 from zope.app import zapi