Wed Mar 17 12:37:38 EST 2004

Update of /cvs-repository/Zope3/src/zope/app/form/browser/tests
In directory cvs.zope.org:/tmp/cvs-serv14311/form/browser/tests

Modified Files:
	test_add.py test_browserwidget.py test_checkboxwidget.py 
	test_datetimewidget.py test_datewidget.py test_directives.py 
	test_editview.py test_editwizardview.py test_filewidget.py 
	test_floatwidget.py test_intwidget.py test_listwidget.py 
	test_multicheckboxwidget.py test_multilistwidget.py 
	test_objectwidget.py test_passwordwidget.py 
	test_radiowidget.py test_sequencewidget.py test_setprefix.py 
	test_textareawidget.py test_textwidget.py 
Log Message:


Adjust widget imports to new locations


=== Zope3/src/zope/app/form/browser/tests/test_add.py 1.1 => 1.2 ===

--- Zope3/src/zope/app/form/browser/tests/test_add.py:1.1	Sat Mar 13 20:11:36 2004
+++ Zope3/src/zope/app/form/browser/tests/test_add.py	Wed Mar 17 12:37:06 2004
@@ -29,9 +29,10 @@
 from zope.app.form.browser.metaconfigure import AddFormDirective
 from zope.app.container.interfaces import IAdding
 from zope.app.form.widget import CustomWidgetFactory
-from zope.app.form.browser.widget import TextWidget as Text
-from zope.app.tests.placelesssetup import PlacelessSetup
+from zope.app.form.browser import TextWidget as Text
 from zope.app.form.browser.submit import Update
+from zope.app.tests.placelesssetup import PlacelessSetup
+
 # Foo needs to be imported as globals() are checked
 from zope.app.form.browser.tests.test_editview import IFoo, IBar, Foo
 from zope.app.form.browser.tests.test_editview import FooBarAdapter


=== Zope3/src/zope/app/form/browser/tests/test_browserwidget.py 1.1 => 1.2 ===
--- Zope3/src/zope/app/form/browser/tests/test_browserwidget.py:1.1	Sat Mar 13 20:11:36 2004
+++ Zope3/src/zope/app/form/browser/tests/test_browserwidget.py	Wed Mar 17 12:37:06 2004
@@ -12,7 +12,6 @@
 #
 ##############################################################################
 """
-
 $Id$
 """
 import os


=== Zope3/src/zope/app/form/browser/tests/test_checkboxwidget.py 1.1 => 1.2 ===
--- Zope3/src/zope/app/form/browser/tests/test_checkboxwidget.py:1.1	Sat Mar 13 20:11:37 2004
+++ Zope3/src/zope/app/form/browser/tests/test_checkboxwidget.py	Wed Mar 17 12:37:06 2004
@@ -17,7 +17,7 @@
 import unittest, doctest
 
 from zope.app.form.interfaces import IInputWidget
-from zope.app.form.browser.widget import CheckBoxWidget
+from zope.app.form.browser import CheckBoxWidget
 from zope.publisher.browser import TestRequest
 from zope.schema import Bool
 from zope.interface.verify import verifyClass


=== Zope3/src/zope/app/form/browser/tests/test_datetimewidget.py 1.1 => 1.2 ===
--- Zope3/src/zope/app/form/browser/tests/test_datetimewidget.py:1.1	Sat Mar 13 20:11:37 2004
+++ Zope3/src/zope/app/form/browser/tests/test_datetimewidget.py	Wed Mar 17 12:37:06 2004
@@ -18,7 +18,7 @@
 from zope.app.datetimeutils import parseDatetimetz
 from zope.app.form.browser.tests.test_browserwidget import BrowserWidgetTest
 from zope.app.form.interfaces import IInputWidget
-from zope.app.form.browser.widget import DatetimeWidget
+from zope.app.form.browser import DatetimeWidget
 from zope.app.form.interfaces import ConversionError, WidgetInputError
 from zope.interface.verify import verifyClass
 


=== Zope3/src/zope/app/form/browser/tests/test_datewidget.py 1.1 => 1.2 ===
--- Zope3/src/zope/app/form/browser/tests/test_datewidget.py:1.1	Sat Mar 13 20:11:37 2004
+++ Zope3/src/zope/app/form/browser/tests/test_datewidget.py	Wed Mar 17 12:37:06 2004
@@ -18,7 +18,7 @@
 from zope.app.datetimeutils import parseDatetimetz
 from zope.app.form.browser.tests.test_browserwidget import BrowserWidgetTest
 from zope.app.form.interfaces import IInputWidget
-from zope.app.form.browser.widget import DateWidget
+from zope.app.form.browser import DateWidget
 from zope.app.form.interfaces import ConversionError, WidgetInputError
 from zope.schema import Date
 from zope.interface.verify import verifyClass


=== Zope3/src/zope/app/form/browser/tests/test_directives.py 1.1 => 1.2 ===
--- Zope3/src/zope/app/form/browser/tests/test_directives.py:1.1	Sat Mar 13 20:11:37 2004
+++ Zope3/src/zope/app/form/browser/tests/test_directives.py	Wed Mar 17 12:37:06 2004
@@ -90,7 +90,7 @@
               type="zope.publisher.interfaces.browser.IBrowserRequest"
               for="zope.schema.interfaces.ITextLine"
               provides="zope.app.form.interfaces.IInputWidget"
-              factory="zope.app.form.browser.widget.TextWidget"
+              factory="zope.app.form.browser.TextWidget"
               permission="zope.Public"
               />
 
@@ -117,7 +117,7 @@
               type="zope.publisher.interfaces.browser.IBrowserRequest"
               for="zope.schema.interfaces.ITextLine"
               provides="zope.app.form.interfaces.IInputWidget"
-              factory="zope.app.form.browser.widget.TextWidget"
+              factory="zope.app.form.browser.TextWidget"
               permission="zope.Public"
               />
           <browser:editform
@@ -145,7 +145,7 @@
               type="zope.publisher.interfaces.browser.IBrowserRequest"
               for="zope.schema.interfaces.ITextLine"
               provides="zope.app.form.interfaces.IInputWidget"
-              factory="zope.app.form.browser.widget.TextWidget"
+              factory="zope.app.form.browser.TextWidget"
               permission="zope.Public"
               />
           <browser:editform
@@ -174,7 +174,7 @@
               type="zope.publisher.interfaces.browser.IBrowserRequest"
               for="zope.schema.interfaces.ITextLine"
               provides="zope.app.form.interfaces.IInputWidget"
-              factory="zope.app.form.browser.widget.TextWidget"
+              factory="zope.app.form.browser.TextWidget"
               permission="zope.Public"
               />
           <browser:editform


=== Zope3/src/zope/app/form/browser/tests/test_editview.py 1.1 => 1.2 ===
--- Zope3/src/zope/app/form/browser/tests/test_editview.py:1.1	Sat Mar 13 20:11:37 2004
+++ Zope3/src/zope/app/form/browser/tests/test_editview.py	Wed Mar 17 12:37:06 2004
@@ -25,8 +25,8 @@
 from zope.app.tests.placelesssetup import PlacelessSetup
 from zope.app.event.tests.placelesssetup import getEvents
 
+from zope.app.form.browser import TextWidget
 from zope.app.form.browser.editview import EditView
-from zope.app.form.browser.widget import TextWidget
 from zope.app.form.browser.submit import Update
 from zope.component.exceptions import ComponentLookupError
 from zope.app.form.interfaces import IInputWidget


=== Zope3/src/zope/app/form/browser/tests/test_editwizardview.py 1.1 => 1.2 ===
--- Zope3/src/zope/app/form/browser/tests/test_editwizardview.py:1.1	Sat Mar 13 20:11:37 2004
+++ Zope3/src/zope/app/form/browser/tests/test_editwizardview.py	Wed Mar 17 12:37:06 2004
@@ -25,8 +25,7 @@
 from zope.app.tests.placelesssetup import PlacelessSetup
 
 from zope.app.form.browser.editwizard import EditWizardView
-from zope.app.form.browser.widget import TextWidget
-
+from zope.app.form.browser import TextWidget
 from zope.app.form.interfaces import IInputWidget
 
 


=== Zope3/src/zope/app/form/browser/tests/test_filewidget.py 1.1 => 1.2 ===
--- Zope3/src/zope/app/form/browser/tests/test_filewidget.py:1.1	Sat Mar 13 20:11:37 2004
+++ Zope3/src/zope/app/form/browser/tests/test_filewidget.py	Wed Mar 17 12:37:06 2004
@@ -18,7 +18,7 @@
 
 from StringIO import StringIO
 from zope.app.form.interfaces import IInputWidget
-from zope.app.form.browser.widget import FileWidget
+from zope.app.form.browser import FileWidget
 
 from zope.app.form.browser.tests.test_browserwidget import BrowserWidgetTest
 


=== Zope3/src/zope/app/form/browser/tests/test_floatwidget.py 1.1 => 1.2 ===
--- Zope3/src/zope/app/form/browser/tests/test_floatwidget.py:1.1	Sat Mar 13 20:11:37 2004
+++ Zope3/src/zope/app/form/browser/tests/test_floatwidget.py	Wed Mar 17 12:37:06 2004
@@ -17,7 +17,7 @@
 import unittest, doctest
 from zope.app.form.browser.tests.test_browserwidget import BrowserWidgetTest
 from zope.app.form.interfaces import IInputWidget
-from zope.app.form.browser.widget import FloatWidget
+from zope.app.form.browser import FloatWidget
 from zope.app.form.interfaces import ConversionError, WidgetInputError
 from zope.interface.verify import verifyClass
 


=== Zope3/src/zope/app/form/browser/tests/test_intwidget.py 1.1 => 1.2 ===
--- Zope3/src/zope/app/form/browser/tests/test_intwidget.py:1.1	Sat Mar 13 20:11:37 2004
+++ Zope3/src/zope/app/form/browser/tests/test_intwidget.py	Wed Mar 17 12:37:06 2004
@@ -18,7 +18,7 @@
 from unittest import main, makeSuite
 from zope.app.form.browser.tests.test_browserwidget import BrowserWidgetTest
 from zope.app.form.interfaces import IInputWidget
-from zope.app.form.browser.widget import IntWidget
+from zope.app.form.browser import IntWidget
 from zope.app.form.interfaces import ConversionError, WidgetInputError
 from zope.interface.verify import verifyClass
 


=== Zope3/src/zope/app/form/browser/tests/test_listwidget.py 1.1 => 1.2 ===
--- Zope3/src/zope/app/form/browser/tests/test_listwidget.py:1.1	Sat Mar 13 20:11:37 2004
+++ Zope3/src/zope/app/form/browser/tests/test_listwidget.py	Wed Mar 17 12:37:06 2004
@@ -17,7 +17,7 @@
 import unittest, doctest
 
 from zope.app.form.interfaces import IInputWidget
-from zope.app.form.browser.widget import ListWidget
+from zope.app.form.browser import ListWidget
 from zope.app.form.browser.tests.test_browserwidget import BrowserWidgetTest
 from zope.interface.verify import verifyClass
 


=== Zope3/src/zope/app/form/browser/tests/test_multicheckboxwidget.py 1.1 => 1.2 ===
--- Zope3/src/zope/app/form/browser/tests/test_multicheckboxwidget.py:1.1	Sat Mar 13 20:11:37 2004
+++ Zope3/src/zope/app/form/browser/tests/test_multicheckboxwidget.py	Wed Mar 17 12:37:06 2004
@@ -17,7 +17,7 @@
 import unittest, doctest
 
 from zope.app.form.interfaces import IInputWidget
-from zope.app.form.browser.widget import MultiCheckBoxWidget
+from zope.app.form.browser import MultiCheckBoxWidget
 from zope.app.form.browser.tests.test_browserwidget import BrowserWidgetTest
 from zope.interface.verify import verifyClass
 


=== Zope3/src/zope/app/form/browser/tests/test_multilistwidget.py 1.1 => 1.2 ===
--- Zope3/src/zope/app/form/browser/tests/test_multilistwidget.py:1.1	Sat Mar 13 20:11:37 2004
+++ Zope3/src/zope/app/form/browser/tests/test_multilistwidget.py	Wed Mar 17 12:37:06 2004
@@ -17,7 +17,7 @@
 import unittest, doctest
 
 from zope.app.form.interfaces import IInputWidget
-from zope.app.form.browser.widget import MultiListWidget
+from zope.app.form.browser import MultiListWidget
 from zope.app.form.browser.tests.test_browserwidget import BrowserWidgetTest
 from zope.interface.verify import verifyClass
 


=== Zope3/src/zope/app/form/browser/tests/test_objectwidget.py 1.1 => 1.2 ===
--- Zope3/src/zope/app/form/browser/tests/test_objectwidget.py:1.1	Sat Mar 13 20:11:37 2004
+++ Zope3/src/zope/app/form/browser/tests/test_objectwidget.py	Wed Mar 17 12:37:06 2004
@@ -23,7 +23,7 @@
 from zope.publisher.browser import TestRequest
 from zope.schema import Object, TextLine
 from zope.app.form.interfaces import IInputWidget
-from zope.app.form.browser.widget import TextWidget, ObjectWidget
+from zope.app.form.browser import TextWidget, ObjectWidget
 from zope.interface.verify import verifyClass
 
 from zope.app.form.browser.tests.test_browserwidget import BrowserWidgetTest


=== Zope3/src/zope/app/form/browser/tests/test_passwordwidget.py 1.1 => 1.2 ===
--- Zope3/src/zope/app/form/browser/tests/test_passwordwidget.py:1.1	Sat Mar 13 20:11:37 2004
+++ Zope3/src/zope/app/form/browser/tests/test_passwordwidget.py	Wed Mar 17 12:37:06 2004
@@ -17,7 +17,7 @@
 import unittest, doctest
 
 from zope.app.form.interfaces import IInputWidget
-from zope.app.form.browser.widget import PasswordWidget
+from zope.app.form.browser import PasswordWidget
 from zope.app.form.browser.tests.test_browserwidget import BrowserWidgetTest
 from zope.interface.verify import verifyClass
 


=== Zope3/src/zope/app/form/browser/tests/test_radiowidget.py 1.1 => 1.2 ===
--- Zope3/src/zope/app/form/browser/tests/test_radiowidget.py:1.1	Sat Mar 13 20:11:37 2004
+++ Zope3/src/zope/app/form/browser/tests/test_radiowidget.py	Wed Mar 17 12:37:06 2004
@@ -24,7 +24,7 @@
 
 from zope.app.tests import ztapi
 from zope.app.form.interfaces import IInputWidget
-from zope.app.form.browser.widget import RadioWidget
+from zope.app.form.browser import RadioWidget
 from zope.app.form.browser.tests.test_browserwidget import BrowserWidgetTest
 import zope.app.form.browser.tests
 


=== Zope3/src/zope/app/form/browser/tests/test_sequencewidget.py 1.1 => 1.2 ===
--- Zope3/src/zope/app/form/browser/tests/test_sequencewidget.py:1.1	Sat Mar 13 20:11:37 2004
+++ Zope3/src/zope/app/form/browser/tests/test_sequencewidget.py	Wed Mar 17 12:37:06 2004
@@ -17,15 +17,15 @@
 
 import unittest, doctest
 
-from zope.app.tests import ztapi
-from zope.app.form.browser.widget import TextWidget
+from zope.schema import Tuple, List, TextLine
 from zope.schema.interfaces import ITextLine, ValidationError
 from zope.publisher.browser import TestRequest
-from zope.schema import Tuple, List, TextLine
-from zope.app.form.interfaces import IInputWidget
-from zope.app.form.browser.widget import TupleSequenceWidget
-from zope.app.form.browser.widget import ListSequenceWidget
 from zope.interface.verify import verifyClass
+
+from zope.app.tests import ztapi
+from zope.app.form.browser import TextWidget, TupleSequenceWidget
+from zope.app.form.browser import ListSequenceWidget
+from zope.app.form.interfaces import IInputWidget
 
 from zope.app.form.browser.tests.test_browserwidget import BrowserWidgetTest
 


=== Zope3/src/zope/app/form/browser/tests/test_setprefix.py 1.1 => 1.2 ===
--- Zope3/src/zope/app/form/browser/tests/test_setprefix.py:1.1	Sat Mar 13 20:11:37 2004
+++ Zope3/src/zope/app/form/browser/tests/test_setprefix.py	Wed Mar 17 12:37:06 2004
@@ -16,7 +16,7 @@
 """
 import unittest
 
-from zope.app.form.browser.widget import TextWidget
+from zope.app.form.browser import TextWidget
 from zope.publisher.browser import TestRequest
 from zope.schema import Text
 


=== Zope3/src/zope/app/form/browser/tests/test_textareawidget.py 1.1 => 1.2 ===
--- Zope3/src/zope/app/form/browser/tests/test_textareawidget.py:1.1	Sat Mar 13 20:11:37 2004
+++ Zope3/src/zope/app/form/browser/tests/test_textareawidget.py	Wed Mar 17 12:37:06 2004
@@ -17,7 +17,7 @@
 import unittest, doctest
 
 from zope.app.form.interfaces import IInputWidget
-from zope.app.form.browser.widget import TextAreaWidget
+from zope.app.form.browser import TextAreaWidget
 from zope.app.form.browser.tests.test_browserwidget import BrowserWidgetTest
 from zope.interface.verify import verifyClass
 


=== Zope3/src/zope/app/form/browser/tests/test_textwidget.py 1.1 => 1.2 ===
--- Zope3/src/zope/app/form/browser/tests/test_textwidget.py:1.1	Sat Mar 13 20:11:37 2004
+++ Zope3/src/zope/app/form/browser/tests/test_textwidget.py	Wed Mar 17 12:37:06 2004
@@ -20,7 +20,7 @@
 from zope.schema import TextLine
 
 from zope.app.form.interfaces import IInputWidget
-from zope.app.form.browser.widget import TextWidget
+from zope.app.form.browser import TextWidget
 from zope.app.form.browser.tests.test_browserwidget import BrowserWidgetTest
 
 class TextWidgetTest(BrowserWidgetTest):


