[Checkins] SVN: Sandbox/faassen/zope.formlibwidget/ * move zope.app.form to zope.formlibwidget (before cleaning)
Martijn Faassen
faassen at startifact.com
Wed Dec 30 12:32:59 EST 2009
Log message for revision 107364:
* move zope.app.form to zope.formlibwidget (before cleaning)
* switch over from zope.testing.doctest to doctest (though for a
strange reason a deprecation warning still remains..?)
Changed:
U Sandbox/faassen/zope.formlibwidget/buildout.cfg
U Sandbox/faassen/zope.formlibwidget/setup.py
D Sandbox/faassen/zope.formlibwidget/src/zope/app/
A Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/
U Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/__init__.py
U Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/README.txt
U Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/__init__.py
U Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/add.py
U Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/boolwidgets.py
U Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/configure.zcml
U Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/editview.py
U Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/exception.py
U Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/form.txt
U Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/formview.py
U Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/i18n.py
U Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/i18n.txt
U Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/interfaces.py
U Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/itemswidgets.py
U Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/metaconfigure.py
U Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/metadirectives.py
U Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/objectwidget.py
U Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/objectwidget.txt
U Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/schemadisplay.py
U Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/sequencewidget.py
U Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/source.py
U Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/source.txt
U Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/registerWidgets.zcml
U Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/support.py
U Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_add.py
U Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_browserwidget.py
U Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_checkboxwidget.py
U Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_choicecollections.py
U Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_choicewidget.py
U Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_datetimewidget.py
U Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_datewidget.py
U Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_decimalwidget.py
U Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_directives.py
U Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_displaywidget.py
U Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_editview.py
U Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_exception.py
U Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_filewidget.py
U Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_floatwidget.py
U Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_form.py
U Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_functional_booleanradiowidget.py
U Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_functional_checkboxwidget.py
U Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_functional_datetimewidget.py
U Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_functional_decimalwidget.py
U Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_functional_editview.py
U Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_functional_filewidget.py
U Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_functional_floatwidget.py
U Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_functional_i18n.py
U Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_functional_intwidget.py
U Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_functional_objectwidget.py
U Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_functional_selectwidget.py
U Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_functional_textareawidget.py
U Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_functional_textwidget.py
U Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_intwidget.py
U Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_itemswidget.py
U Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_multicheckboxwidget.py
U Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_objectwidget.py
U Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_passwordwidget.py
U Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_radiowidget.py
U Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_registrations.py
U Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_selectwidget.py
U Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_sequencewidget.py
U Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_setprefix.py
U Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_source.py
U Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_textareawidget.py
U Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_textwidget.py
U Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_widgetdirective.py
U Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_widgetdocs.py
U Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/widgetDirectives.zcml
U Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/textwidgets.py
U Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/widget.py
U Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/widgets.txt
U Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/ftesting.zcml
U Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/testing.py
U Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/tests/test_utility.py
U Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/tests/test_widget.py
U Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/utility.py
-=-
Modified: Sandbox/faassen/zope.formlibwidget/buildout.cfg
===================================================================
--- Sandbox/faassen/zope.formlibwidget/buildout.cfg 2009-12-30 16:38:32 UTC (rev 107363)
+++ Sandbox/faassen/zope.formlibwidget/buildout.cfg 2009-12-30 17:32:58 UTC (rev 107364)
@@ -4,4 +4,4 @@
[test]
recipe = zc.recipe.testrunner
-eggs = zope.app.form [test]
+eggs = zope.formlibwidget [test]
Modified: Sandbox/faassen/zope.formlibwidget/setup.py
===================================================================
--- Sandbox/faassen/zope.formlibwidget/setup.py 2009-12-30 16:38:32 UTC (rev 107363)
+++ Sandbox/faassen/zope.formlibwidget/setup.py 2009-12-30 17:32:58 UTC (rev 107364)
@@ -26,29 +26,29 @@
def read(*rnames):
return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
-setup(name='zope.app.form',
+setup(name='zope.formlibwidget',
version = '3.12.2dev',
author='Zope Corporation and Contributors',
author_email='zope-dev at zope.org',
- description='The Original Zope 3 Form Framework',
+ description='Widgets for zope.formlib',
long_description=(
read('README.txt')
+ '\n\n' +
'Detailed documentation:\n'
+ '\n\n' +
- read('src', 'zope', 'app', 'form', 'browser', 'README.txt')
+ read('src', 'zope', 'formlibwidget', 'browser', 'README.txt')
+ '\n\n' +
- read('src', 'zope', 'app', 'form', 'browser', 'widgets.txt')
+ read('src', 'zope', 'formlibwidget', 'browser', 'widgets.txt')
+ '\n\n' +
- read('src', 'zope', 'app', 'form', 'browser', 'objectwidget.txt')
+ read('src', 'zope', 'formlibwidget', 'browser', 'objectwidget.txt')
+ '\n\n' +
- read('src', 'zope', 'app', 'form', 'browser', 'source.txt')
+ read('src', 'zope', 'formlibwidget', 'browser', 'source.txt')
+ '\n\n' +
- read('src', 'zope', 'app', 'form', 'browser', 'i18n.txt')
+ read('src', 'zope', 'formlibwidget', 'browser', 'i18n.txt')
+ '\n\n' +
read('CHANGES.txt')
),
- keywords = "zope3 form widget zcml",
+ keywords = "zope3 form widget formlib",
classifiers = [
'Development Status :: 5 - Production/Stable',
'Environment :: Web Environment',
@@ -59,11 +59,11 @@
'Operating System :: OS Independent',
'Topic :: Internet :: WWW/HTTP',
'Framework :: Zope3'],
- url='http://pypi.python.org/pypi/zope.app.form',
+ url='http://pypi.python.org/pypi/zope.formlibwidget',
license='ZPL 2.1',
packages=find_packages('src'),
package_dir = {'': 'src'},
- namespace_packages=['zope', 'zope.app'],
+ namespace_packages=['zope'],
extras_require={'test': [
'ZODB3',
'zc.sourcefactory',
Modified: Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/__init__.py
===================================================================
--- Sandbox/faassen/zope.formlibwidget/src/zope/app/form/__init__.py 2009-12-30 16:38:32 UTC (rev 107363)
+++ Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/__init__.py 2009-12-30 17:32:58 UTC (rev 107364)
@@ -17,7 +17,7 @@
"""
__docformat__ = 'restructuredtext'
-from zope.app.form.interfaces import IWidget, InputErrors, IWidgetFactory
+from zope.formlibwidget.interfaces import IWidget, InputErrors, IWidgetFactory
from zope.interface import implements
from zope.i18n import translate
from zope.schema.interfaces import IChoice, ICollection
Modified: Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/README.txt
===================================================================
--- Sandbox/faassen/zope.formlibwidget/src/zope/app/form/browser/README.txt 2009-12-30 16:38:32 UTC (rev 107363)
+++ Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/README.txt 2009-12-30 17:32:58 UTC (rev 107364)
@@ -13,7 +13,7 @@
<view
type="zope.publisher.interfaces.browser.IBrowserRequest"
for="zope.schema.interfaces.ITextLine"
- provides="zope.app.form.interfaces.IInputWidget"
+ provides="zope.formlibwidget.interfaces.IInputWidget"
factory=".TextWidget"
permission="zope.Public"
/>
@@ -22,7 +22,7 @@
(i.e., the `TextWidget` class).
Some widgets in Zope 3 extend this pattern. This extension is configurable:
-simply do not load the zope/app/form/browser/configure.zcml file if you do not
+simply do not load the zope/formlibwidget/browser/configure.zcml file if you do not
wish to participate in the extension. The widget registration is extended for
`Choice` fields and for the `collection` fields.
@@ -52,7 +52,7 @@
may provide a query which implements an interface appropriate for that
vocabulary. You then can register a query view -- a view registered for the
query interface and the field interface -- that implements
-`zope.app.forms.browser.interfaces.IVocabularyQueryView`.
+`zope.formlibwidgets.browser.interfaces.IVocabularyQueryView`.
Default Collection Field Widget Registration and Lookup
=======================================================
@@ -113,7 +113,7 @@
type="zope.publisher.interfaces.browser.IBrowserRequest"
for="zope.schema.interfaces.IBag
zope.schema.interfaces.IChoice"
- provides="zope.app.form.interfaces.IDisplayWidget"
+ provides="zope.formlibwidget.interfaces.IDisplayWidget"
factory=".ChoiceCollectionDisplayWidget"
permission="zope.Public"
/>
@@ -122,7 +122,7 @@
type="zope.publisher.interfaces.browser.IBrowserRequest"
for="zope.schema.interfaces.IBag
zope.schema.interfaces.IChoice"
- provides="zope.app.form.interfaces.IInputWidget"
+ provides="zope.formlibwidget.interfaces.IInputWidget"
factory=".ChoiceCollectionInputWidget"
permission="zope.Public"
/>
@@ -135,7 +135,7 @@
type="zope.publisher.interfaces.browser.IBrowserRequest"
for="zope.schema.interfaces.IBag
zope.schema.interfaces.IField"
- provides="zope.app.form.interfaces.IInputWidget"
+ provides="zope.formlibwidget.interfaces.IInputWidget"
factory=".BagSequenceWidget"
permission="zope.Public"
/>
@@ -148,7 +148,7 @@
type="zope.publisher.interfaces.browser.IBrowserRequest"
for="zope.schema.interfaces.IBag
zope.schema.interfaces.IIterableVocabulary"
- provides="zope.app.form.interfaces.IInputWidget"
+ provides="zope.formlibwidget.interfaces.IInputWidget"
factory=".BagWidget"
permission="zope.Public"
/>
@@ -173,6 +173,6 @@
To switch the old behaviour back on for backwards compatibility, do
- zope.app.form.browser.itemswidgets.EXPLICIT_EMPTY_SELECTION = False
+ zope.formlibwidget.browser.itemswidgets.EXPLICIT_EMPTY_SELECTION = False
during application start-up.
Modified: Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/__init__.py
===================================================================
--- Sandbox/faassen/zope.formlibwidget/src/zope/app/form/browser/__init__.py 2009-12-30 16:38:32 UTC (rev 107363)
+++ Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/__init__.py 2009-12-30 17:32:58 UTC (rev 107364)
@@ -17,64 +17,64 @@
"""
__docformat__ = 'restructuredtext'
-from zope.app.form.browser.widget import BrowserWidget, DisplayWidget
-from zope.app.form.browser.widget import UnicodeDisplayWidget
+from zope.formlibwidget.browser.widget import BrowserWidget, DisplayWidget
+from zope.formlibwidget.browser.widget import UnicodeDisplayWidget
-from zope.app.form.browser.textwidgets import TextWidget, BytesWidget
-from zope.app.form.browser.textwidgets import TextAreaWidget, BytesAreaWidget
-from zope.app.form.browser.textwidgets import PasswordWidget, FileWidget
-from zope.app.form.browser.textwidgets import ASCIIWidget, ASCIIAreaWidget
-from zope.app.form.browser.textwidgets import IntWidget, FloatWidget
-from zope.app.form.browser.textwidgets import DecimalWidget
-from zope.app.form.browser.textwidgets import DatetimeWidget, DateWidget
-from zope.app.form.browser.textwidgets import DatetimeI18nWidget
-from zope.app.form.browser.textwidgets import DateI18nWidget
-from zope.app.form.browser.textwidgets import DatetimeDisplayWidget
-from zope.app.form.browser.textwidgets import DateDisplayWidget
-from zope.app.form.browser.textwidgets import BytesDisplayWidget
-from zope.app.form.browser.textwidgets import ASCIIDisplayWidget
-from zope.app.form.browser.textwidgets import URIDisplayWidget
+from zope.formlibwidget.browser.textwidgets import TextWidget, BytesWidget
+from zope.formlibwidget.browser.textwidgets import TextAreaWidget, BytesAreaWidget
+from zope.formlibwidget.browser.textwidgets import PasswordWidget, FileWidget
+from zope.formlibwidget.browser.textwidgets import ASCIIWidget, ASCIIAreaWidget
+from zope.formlibwidget.browser.textwidgets import IntWidget, FloatWidget
+from zope.formlibwidget.browser.textwidgets import DecimalWidget
+from zope.formlibwidget.browser.textwidgets import DatetimeWidget, DateWidget
+from zope.formlibwidget.browser.textwidgets import DatetimeI18nWidget
+from zope.formlibwidget.browser.textwidgets import DateI18nWidget
+from zope.formlibwidget.browser.textwidgets import DatetimeDisplayWidget
+from zope.formlibwidget.browser.textwidgets import DateDisplayWidget
+from zope.formlibwidget.browser.textwidgets import BytesDisplayWidget
+from zope.formlibwidget.browser.textwidgets import ASCIIDisplayWidget
+from zope.formlibwidget.browser.textwidgets import URIDisplayWidget
# Widgets for boolean fields
-from zope.app.form.browser.boolwidgets import CheckBoxWidget
-from zope.app.form.browser.boolwidgets import BooleanRadioWidget
-from zope.app.form.browser.boolwidgets import BooleanSelectWidget
-from zope.app.form.browser.boolwidgets import BooleanDropdownWidget
+from zope.formlibwidget.browser.boolwidgets import CheckBoxWidget
+from zope.formlibwidget.browser.boolwidgets import BooleanRadioWidget
+from zope.formlibwidget.browser.boolwidgets import BooleanSelectWidget
+from zope.formlibwidget.browser.boolwidgets import BooleanDropdownWidget
# Choice and Sequence Display Widgets
-from zope.app.form.browser.itemswidgets import ItemDisplayWidget
-from zope.app.form.browser.itemswidgets import ItemsMultiDisplayWidget
-from zope.app.form.browser.itemswidgets import SetDisplayWidget
-from zope.app.form.browser.itemswidgets import ListDisplayWidget
+from zope.formlibwidget.browser.itemswidgets import ItemDisplayWidget
+from zope.formlibwidget.browser.itemswidgets import ItemsMultiDisplayWidget
+from zope.formlibwidget.browser.itemswidgets import SetDisplayWidget
+from zope.formlibwidget.browser.itemswidgets import ListDisplayWidget
# Widgets for fields with vocabularies.
# Note that these are only dispatchers for the widgets below.
-from zope.app.form.browser.itemswidgets import ChoiceDisplayWidget
-from zope.app.form.browser.itemswidgets import ChoiceInputWidget
-from zope.app.form.browser.itemswidgets import CollectionDisplayWidget
-from zope.app.form.browser.itemswidgets import CollectionInputWidget
-from zope.app.form.browser.itemswidgets import ChoiceCollectionDisplayWidget
-from zope.app.form.browser.itemswidgets import ChoiceCollectionInputWidget
+from zope.formlibwidget.browser.itemswidgets import ChoiceDisplayWidget
+from zope.formlibwidget.browser.itemswidgets import ChoiceInputWidget
+from zope.formlibwidget.browser.itemswidgets import CollectionDisplayWidget
+from zope.formlibwidget.browser.itemswidgets import CollectionInputWidget
+from zope.formlibwidget.browser.itemswidgets import ChoiceCollectionDisplayWidget
+from zope.formlibwidget.browser.itemswidgets import ChoiceCollectionInputWidget
# Widgets that let you choose a single item from a list
# These widgets are multi-views on (field, vocabulary)
-from zope.app.form.browser.itemswidgets import SelectWidget
-from zope.app.form.browser.itemswidgets import DropdownWidget
-from zope.app.form.browser.itemswidgets import RadioWidget
+from zope.formlibwidget.browser.itemswidgets import SelectWidget
+from zope.formlibwidget.browser.itemswidgets import DropdownWidget
+from zope.formlibwidget.browser.itemswidgets import RadioWidget
# Widgets that let you choose several items from a list
# These widgets are multi-views on (field, vocabulary)
-from zope.app.form.browser.itemswidgets import MultiSelectWidget
-from zope.app.form.browser.itemswidgets import MultiSelectSetWidget
-from zope.app.form.browser.itemswidgets import MultiSelectFrozenSetWidget
-from zope.app.form.browser.itemswidgets import MultiCheckBoxWidget
-from zope.app.form.browser.itemswidgets import OrderedMultiSelectWidget
+from zope.formlibwidget.browser.itemswidgets import MultiSelectWidget
+from zope.formlibwidget.browser.itemswidgets import MultiSelectSetWidget
+from zope.formlibwidget.browser.itemswidgets import MultiSelectFrozenSetWidget
+from zope.formlibwidget.browser.itemswidgets import MultiCheckBoxWidget
+from zope.formlibwidget.browser.itemswidgets import OrderedMultiSelectWidget
# Widgets that let you enter several items in a sequence
# These widgets are multi-views on (sequence type, value type)
-from zope.app.form.browser.sequencewidget import SequenceWidget
-from zope.app.form.browser.sequencewidget import TupleSequenceWidget
-from zope.app.form.browser.sequencewidget import ListSequenceWidget
-from zope.app.form.browser.sequencewidget import SequenceDisplayWidget
+from zope.formlibwidget.browser.sequencewidget import SequenceWidget
+from zope.formlibwidget.browser.sequencewidget import TupleSequenceWidget
+from zope.formlibwidget.browser.sequencewidget import ListSequenceWidget
+from zope.formlibwidget.browser.sequencewidget import SequenceDisplayWidget
-from zope.app.form.browser.objectwidget import ObjectWidget
+from zope.formlibwidget.browser.objectwidget import ObjectWidget
Modified: Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/add.py
===================================================================
--- Sandbox/faassen/zope.formlibwidget/src/zope/app/form/browser/add.py 2009-12-30 16:38:32 UTC (rev 107363)
+++ Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/add.py 2009-12-30 17:32:58 UTC (rev 107364)
@@ -29,9 +29,9 @@
from zope.lifecycleevent import ObjectCreatedEvent, ObjectModifiedEvent
from zope.lifecycleevent import Attributes
-from zope.app.form.utility import setUpWidgets, getWidgetsData
-from zope.app.form.interfaces import IInputWidget, WidgetsError
-from zope.app.form.browser.i18n import _
+from zope.formlibwidget.utility import setUpWidgets, getWidgetsData
+from zope.formlibwidget.interfaces import IInputWidget, WidgetsError
+from zope.formlibwidget.browser.i18n import _
from zope.browserpage.simpleviewclass import SimpleViewClass
from zope.browserpage import ViewPageTemplateFile
from editview import EditView
Modified: Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/boolwidgets.py
===================================================================
--- Sandbox/faassen/zope.formlibwidget/src/zope/app/form/browser/boolwidgets.py 2009-12-30 16:38:32 UTC (rev 107363)
+++ Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/boolwidgets.py 2009-12-30 17:32:58 UTC (rev 107364)
@@ -20,12 +20,12 @@
from zope.interface import implements
from zope.schema.vocabulary import SimpleVocabulary
-from zope.app.form.browser.widget import SimpleInputWidget, renderElement
-from zope.app.form.browser.widget import DisplayWidget
-from zope.app.form.browser.i18n import _
-from zope.app.form.browser.itemswidgets import RadioWidget
-from zope.app.form.browser.itemswidgets import SelectWidget, DropdownWidget
-from zope.app.form.interfaces import IInputWidget
+from zope.formlibwidget.browser.widget import SimpleInputWidget, renderElement
+from zope.formlibwidget.browser.widget import DisplayWidget
+from zope.formlibwidget.browser.i18n import _
+from zope.formlibwidget.browser.itemswidgets import RadioWidget
+from zope.formlibwidget.browser.itemswidgets import SelectWidget, DropdownWidget
+from zope.formlibwidget.interfaces import IInputWidget
class CheckBoxWidget(SimpleInputWidget):
Modified: Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/configure.zcml
===================================================================
--- Sandbox/faassen/zope.formlibwidget/src/zope/app/form/browser/configure.zcml 2009-12-30 16:38:32 UTC (rev 107363)
+++ Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/configure.zcml 2009-12-30 17:32:58 UTC (rev 107364)
@@ -29,10 +29,10 @@
<!-- Views for Widget Errors -->
<adapter
- for="zope.app.form.interfaces.IWidgetInputError
+ for="zope.formlibwidget.interfaces.IWidgetInputError
zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.app.form.browser.interfaces.IWidgetInputErrorView"
- factory="zope.app.form.browser.exception.WidgetInputErrorView"
+ provides="zope.formlibwidget.browser.interfaces.IWidgetInputErrorView"
+ factory="zope.formlibwidget.browser.exception.WidgetInputErrorView"
permission="zope.Public"
/>
@@ -41,7 +41,7 @@
<adapter
for="zope.schema.interfaces.IField
zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.app.form.interfaces.IDisplayWidget"
+ provides="zope.formlibwidget.interfaces.IDisplayWidget"
factory=".DisplayWidget"
permission="zope.Public"
/>
@@ -49,7 +49,7 @@
<adapter
for="zope.schema.interfaces.IBool
zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.app.form.interfaces.IDisplayWidget"
+ provides="zope.formlibwidget.interfaces.IDisplayWidget"
factory=".boolwidgets.BooleanDisplayWidget"
permission="zope.Public"
/>
@@ -57,7 +57,7 @@
<adapter
for="zope.schema.interfaces.IBytes
zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.app.form.interfaces.IDisplayWidget"
+ provides="zope.formlibwidget.interfaces.IDisplayWidget"
factory=".textwidgets.BytesDisplayWidget"
permission="zope.Public"
/>
@@ -65,7 +65,7 @@
<adapter
for="zope.schema.interfaces.IBytesLine
zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.app.form.interfaces.IDisplayWidget"
+ provides="zope.formlibwidget.interfaces.IDisplayWidget"
factory=".DisplayWidget"
permission="zope.Public"
/>
@@ -73,7 +73,7 @@
<adapter
for="zope.schema.interfaces.IASCII
zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.app.form.interfaces.IDisplayWidget"
+ provides="zope.formlibwidget.interfaces.IDisplayWidget"
factory=".textwidgets.ASCIIDisplayWidget"
permission="zope.Public"
/>
@@ -81,7 +81,7 @@
<adapter
for="zope.schema.interfaces.IASCIILine
zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.app.form.interfaces.IDisplayWidget"
+ provides="zope.formlibwidget.interfaces.IDisplayWidget"
factory=".DisplayWidget"
permission="zope.Public"
/>
@@ -89,7 +89,7 @@
<adapter
for="zope.schema.interfaces.IURI
zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.app.form.interfaces.IDisplayWidget"
+ provides="zope.formlibwidget.interfaces.IDisplayWidget"
factory=".textwidgets.URIDisplayWidget"
permission="zope.Public"
/>
@@ -97,7 +97,7 @@
<adapter
for="zope.schema.interfaces.IDate
zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.app.form.interfaces.IDisplayWidget"
+ provides="zope.formlibwidget.interfaces.IDisplayWidget"
factory=".DateDisplayWidget"
permission="zope.Public"
/>
@@ -105,7 +105,7 @@
<adapter
for="zope.schema.interfaces.IDatetime
zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.app.form.interfaces.IDisplayWidget"
+ provides="zope.formlibwidget.interfaces.IDisplayWidget"
factory=".DatetimeDisplayWidget"
permission="zope.Public"
/>
@@ -115,7 +115,7 @@
<adapter
for="zope.schema.interfaces.ITextLine
zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.app.form.browser.interfaces.ITextBrowserWidget"
+ provides="zope.formlibwidget.browser.interfaces.ITextBrowserWidget"
factory=".TextWidget"
permission="zope.Public"
/>
@@ -123,7 +123,7 @@
<adapter
for="zope.schema.interfaces.IText
zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.app.form.browser.interfaces.ISimpleInputWidget"
+ provides="zope.formlibwidget.browser.interfaces.ISimpleInputWidget"
factory=".TextAreaWidget"
permission="zope.Public"
/>
@@ -131,7 +131,7 @@
<adapter
for="zope.schema.interfaces.ISourceText
zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.app.form.browser.interfaces.ISimpleInputWidget"
+ provides="zope.formlibwidget.browser.interfaces.ISimpleInputWidget"
factory=".TextAreaWidget"
permission="zope.Public"
/>
@@ -139,7 +139,7 @@
<adapter
for="zope.schema.interfaces.IBytesLine
zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.app.form.browser.interfaces.ISimpleInputWidget"
+ provides="zope.formlibwidget.browser.interfaces.ISimpleInputWidget"
factory=".BytesWidget"
permission="zope.Public"
/>
@@ -147,7 +147,7 @@
<adapter
for="zope.schema.interfaces.IBytes
zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.app.form.browser.interfaces.ISimpleInputWidget"
+ provides="zope.formlibwidget.browser.interfaces.ISimpleInputWidget"
factory=".FileWidget"
permission="zope.Public"
/>
@@ -155,7 +155,7 @@
<adapter
for="zope.schema.interfaces.IASCII
zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.app.form.browser.interfaces.ISimpleInputWidget"
+ provides="zope.formlibwidget.browser.interfaces.ISimpleInputWidget"
factory=".ASCIIAreaWidget"
permission="zope.Public"
/>
@@ -163,7 +163,7 @@
<adapter
for="zope.schema.interfaces.IASCIILine
zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.app.form.browser.interfaces.ISimpleInputWidget"
+ provides="zope.formlibwidget.browser.interfaces.ISimpleInputWidget"
factory=".ASCIIWidget"
permission="zope.Public"
/>
@@ -171,7 +171,7 @@
<adapter
for="zope.schema.interfaces.IInt
zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.app.form.browser.interfaces.ISimpleInputWidget"
+ provides="zope.formlibwidget.browser.interfaces.ISimpleInputWidget"
factory=".IntWidget"
permission="zope.Public"
/>
@@ -179,7 +179,7 @@
<adapter
for="zope.schema.interfaces.IInt
zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.app.form.interfaces.IDisplayWidget"
+ provides="zope.formlibwidget.interfaces.IDisplayWidget"
factory=".UnicodeDisplayWidget"
permission="zope.Public"
/>
@@ -187,7 +187,7 @@
<adapter
for="zope.schema.interfaces.IFloat
zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.app.form.browser.interfaces.ISimpleInputWidget"
+ provides="zope.formlibwidget.browser.interfaces.ISimpleInputWidget"
factory=".FloatWidget"
permission="zope.Public"
/>
@@ -195,7 +195,7 @@
<adapter
for="zope.schema.interfaces.IFloat
zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.app.form.interfaces.IDisplayWidget"
+ provides="zope.formlibwidget.interfaces.IDisplayWidget"
factory=".UnicodeDisplayWidget"
permission="zope.Public"
/>
@@ -203,7 +203,7 @@
<adapter
for="zope.schema.interfaces.IDecimal
zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.app.form.browser.interfaces.ISimpleInputWidget"
+ provides="zope.formlibwidget.browser.interfaces.ISimpleInputWidget"
factory=".DecimalWidget"
permission="zope.Public"
/>
@@ -211,7 +211,7 @@
<adapter
for="zope.schema.interfaces.IDecimal
zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.app.form.interfaces.IDisplayWidget"
+ provides="zope.formlibwidget.interfaces.IDisplayWidget"
factory=".UnicodeDisplayWidget"
permission="zope.Public"
/>
@@ -219,7 +219,7 @@
<adapter
for="zope.schema.interfaces.IDatetime
zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.app.form.browser.interfaces.ISimpleInputWidget"
+ provides="zope.formlibwidget.browser.interfaces.ISimpleInputWidget"
factory=".DatetimeWidget"
permission="zope.Public"
/>
@@ -227,7 +227,7 @@
<adapter
for="zope.schema.interfaces.IDate
zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.app.form.browser.interfaces.ISimpleInputWidget"
+ provides="zope.formlibwidget.browser.interfaces.ISimpleInputWidget"
factory=".DateWidget"
permission="zope.Public"
/>
@@ -235,7 +235,7 @@
<adapter
for="zope.schema.interfaces.IBool
zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.app.form.browser.interfaces.ISimpleInputWidget"
+ provides="zope.formlibwidget.browser.interfaces.ISimpleInputWidget"
factory=".CheckBoxWidget"
permission="zope.Public"
/>
@@ -243,7 +243,7 @@
<adapter
for="zope.schema.interfaces.IPassword
zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.app.form.browser.interfaces.ISimpleInputWidget"
+ provides="zope.formlibwidget.browser.interfaces.ISimpleInputWidget"
factory=".PasswordWidget"
permission="zope.Public"
/>
@@ -254,7 +254,7 @@
<adapter
for="zope.schema.interfaces.IChoice
zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.app.form.interfaces.IDisplayWidget"
+ provides="zope.formlibwidget.interfaces.IDisplayWidget"
factory=".ChoiceDisplayWidget"
permission="zope.Public"
/>
@@ -262,7 +262,7 @@
<adapter
for="zope.schema.interfaces.IChoice
zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.app.form.browser.interfaces.ISimpleInputWidget"
+ provides="zope.formlibwidget.browser.interfaces.ISimpleInputWidget"
factory=".ChoiceInputWidget"
permission="zope.Public"
/>
@@ -271,7 +271,7 @@
<adapter
for="zope.schema.interfaces.ICollection
zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.app.form.interfaces.IDisplayWidget"
+ provides="zope.formlibwidget.interfaces.IDisplayWidget"
factory=".CollectionDisplayWidget"
permission="zope.Public"
/>
@@ -279,7 +279,7 @@
<adapter
for="zope.schema.interfaces.ICollection
zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.app.form.browser.interfaces.ISimpleInputWidget"
+ provides="zope.formlibwidget.browser.interfaces.ISimpleInputWidget"
factory=".CollectionInputWidget"
permission="zope.Public"
/>
@@ -294,14 +294,14 @@
<adapter
for="zope.schema.interfaces.ISequence
zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.app.form.interfaces.IDisplayWidget"
+ provides="zope.formlibwidget.interfaces.IDisplayWidget"
factory=".CollectionDisplayWidget"
permission="zope.Public"
/>
<adapter
for="zope.schema.interfaces.ISequence
zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.app.form.browser.interfaces.ISimpleInputWidget"
+ provides="zope.formlibwidget.browser.interfaces.ISimpleInputWidget"
factory=".CollectionInputWidget"
permission="zope.Public"
/>
@@ -315,7 +315,7 @@
for="zope.schema.interfaces.ITuple
zope.schema.interfaces.IField
zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.app.form.browser.interfaces.ISimpleInputWidget"
+ provides="zope.formlibwidget.browser.interfaces.ISimpleInputWidget"
factory=".TupleSequenceWidget"
permission="zope.Public"
/>
@@ -324,7 +324,7 @@
for="zope.schema.interfaces.IList
zope.schema.interfaces.IField
zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.app.form.browser.interfaces.ISimpleInputWidget"
+ provides="zope.formlibwidget.browser.interfaces.ISimpleInputWidget"
factory=".ListSequenceWidget"
permission="zope.Public"
/>
@@ -333,7 +333,7 @@
for="zope.schema.interfaces.ISequence
zope.schema.interfaces.IField
zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.app.form.interfaces.IDisplayWidget"
+ provides="zope.formlibwidget.interfaces.IDisplayWidget"
factory=".SequenceDisplayWidget"
permission="zope.Public"
/>
@@ -350,7 +350,7 @@
for="zope.schema.interfaces.IList
zope.schema.interfaces.IChoice
zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.app.form.interfaces.IDisplayWidget"
+ provides="zope.formlibwidget.interfaces.IDisplayWidget"
factory=".ChoiceCollectionDisplayWidget"
permission="zope.Public"
/>
@@ -359,7 +359,7 @@
for="zope.schema.interfaces.IList
zope.schema.interfaces.IChoice
zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.app.form.browser.interfaces.ISimpleInputWidget"
+ provides="zope.formlibwidget.browser.interfaces.ISimpleInputWidget"
factory=".ChoiceCollectionInputWidget"
permission="zope.Public"
/>
@@ -369,7 +369,7 @@
for="zope.schema.interfaces.ITuple
zope.schema.interfaces.IChoice
zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.app.form.interfaces.IDisplayWidget"
+ provides="zope.formlibwidget.interfaces.IDisplayWidget"
factory=".ChoiceCollectionDisplayWidget"
permission="zope.Public"
/>
@@ -378,7 +378,7 @@
for="zope.schema.interfaces.ITuple
zope.schema.interfaces.IChoice
zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.app.form.browser.interfaces.ISimpleInputWidget"
+ provides="zope.formlibwidget.browser.interfaces.ISimpleInputWidget"
factory=".ChoiceCollectionInputWidget"
permission="zope.Public"
/>
@@ -388,7 +388,7 @@
for="zope.schema.interfaces.ISet
zope.schema.interfaces.IChoice
zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.app.form.interfaces.IDisplayWidget"
+ provides="zope.formlibwidget.interfaces.IDisplayWidget"
factory=".ChoiceCollectionDisplayWidget"
permission="zope.Public"
/>
@@ -397,7 +397,7 @@
for="zope.schema.interfaces.ISet
zope.schema.interfaces.IChoice
zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.app.form.browser.interfaces.ISimpleInputWidget"
+ provides="zope.formlibwidget.browser.interfaces.ISimpleInputWidget"
factory=".ChoiceCollectionInputWidget"
permission="zope.Public"
/>
@@ -407,7 +407,7 @@
for="zope.schema.interfaces.IFrozenSet
zope.schema.interfaces.IChoice
zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.app.form.interfaces.IDisplayWidget"
+ provides="zope.formlibwidget.interfaces.IDisplayWidget"
factory=".ChoiceCollectionDisplayWidget"
permission="zope.Public"
/>
@@ -416,7 +416,7 @@
for="zope.schema.interfaces.IFrozenSet
zope.schema.interfaces.IChoice
zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.app.form.browser.interfaces.ISimpleInputWidget"
+ provides="zope.formlibwidget.browser.interfaces.ISimpleInputWidget"
factory=".ChoiceCollectionInputWidget"
permission="zope.Public"
/>
@@ -427,7 +427,7 @@
for="zope.schema.interfaces.IChoice
zope.schema.interfaces.IBaseVocabulary
zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.app.form.interfaces.IDisplayWidget"
+ provides="zope.formlibwidget.interfaces.IDisplayWidget"
factory=".ItemDisplayWidget"
permission="zope.Public"
/>
@@ -436,7 +436,7 @@
for="zope.schema.interfaces.IChoice
zope.schema.interfaces.IVocabularyTokenized
zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.app.form.browser.interfaces.ISimpleInputWidget"
+ provides="zope.formlibwidget.browser.interfaces.ISimpleInputWidget"
factory=".DropdownWidget"
permission="zope.Public"
/>
@@ -447,7 +447,7 @@
for="zope.schema.interfaces.ISet
zope.schema.interfaces.IIterableSource
zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.app.form.browser.interfaces.ISimpleInputWidget"
+ provides="zope.formlibwidget.browser.interfaces.ISimpleInputWidget"
factory=".source.SourceMultiSelectSetWidget"
permission="zope.Public"
/>
@@ -456,7 +456,7 @@
for="zope.schema.interfaces.IFrozenSet
zope.schema.interfaces.IIterableSource
zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.app.form.browser.interfaces.ISimpleInputWidget"
+ provides="zope.formlibwidget.browser.interfaces.ISimpleInputWidget"
factory=".source.SourceMultiSelectFrozenSetWidget"
permission="zope.Public"
/>
@@ -465,7 +465,7 @@
for="zope.schema.interfaces.IChoice
zope.schema.interfaces.IIterableSource
zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.app.form.browser.interfaces.ISimpleInputWidget"
+ provides="zope.formlibwidget.browser.interfaces.ISimpleInputWidget"
factory=".source.SourceDropdownWidget"
permission="zope.Public"
/>
@@ -474,7 +474,7 @@
for="zope.schema.interfaces.IList
zope.schema.interfaces.IIterableSource
zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.app.form.browser.interfaces.ISimpleInputWidget"
+ provides="zope.formlibwidget.browser.interfaces.ISimpleInputWidget"
factory=".source.SourceOrderedMultiSelectWidget"
permission="zope.Public"
/>
@@ -486,7 +486,7 @@
for="zope.schema.interfaces.ISet
zope.schema.interfaces.IVocabularyTokenized
zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.app.form.browser.interfaces.ISimpleInputWidget"
+ provides="zope.formlibwidget.browser.interfaces.ISimpleInputWidget"
factory=".MultiSelectSetWidget"
permission="zope.Public"
/>
@@ -495,7 +495,7 @@
for="zope.schema.interfaces.IFrozenSet
zope.schema.interfaces.IVocabularyTokenized
zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.app.form.browser.interfaces.ISimpleInputWidget"
+ provides="zope.formlibwidget.browser.interfaces.ISimpleInputWidget"
factory=".MultiSelectFrozenSetWidget"
permission="zope.Public"
/>
@@ -504,7 +504,7 @@
for="zope.schema.interfaces.ISet
zope.schema.interfaces.IBaseVocabulary
zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.app.form.interfaces.IDisplayWidget"
+ provides="zope.formlibwidget.interfaces.IDisplayWidget"
factory=".SetDisplayWidget"
permission="zope.Public"
/>
@@ -513,7 +513,7 @@
for="zope.schema.interfaces.IFrozenSet
zope.schema.interfaces.IBaseVocabulary
zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.app.form.interfaces.IDisplayWidget"
+ provides="zope.formlibwidget.interfaces.IDisplayWidget"
factory=".SetDisplayWidget"
permission="zope.Public"
/>
@@ -522,7 +522,7 @@
for="zope.schema.interfaces.IList
zope.schema.interfaces.IVocabularyTokenized
zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.app.form.browser.interfaces.ISimpleInputWidget"
+ provides="zope.formlibwidget.browser.interfaces.ISimpleInputWidget"
factory=".OrderedMultiSelectWidget"
permission="zope.Public"
/>
@@ -531,7 +531,7 @@
for="zope.schema.interfaces.IList
zope.schema.interfaces.IBaseVocabulary
zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.app.form.interfaces.IDisplayWidget"
+ provides="zope.formlibwidget.interfaces.IDisplayWidget"
factory=".SetDisplayWidget"
permission="zope.Public"
/>
@@ -541,7 +541,7 @@
for="zope.schema.interfaces.IChoice
zope.schema.interfaces.ISource
zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.app.form.interfaces.IDisplayWidget"
+ provides="zope.formlibwidget.interfaces.IDisplayWidget"
factory=".source.SourceDisplayWidget"
permission="zope.Public"
/>
@@ -549,7 +549,7 @@
for="zope.schema.interfaces.IChoice
zope.schema.interfaces.ISource
zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.app.form.browser.interfaces.ISimpleInputWidget"
+ provides="zope.formlibwidget.browser.interfaces.ISimpleInputWidget"
factory=".source.SourceInputWidget"
permission="zope.Public"
/>
@@ -558,7 +558,7 @@
for="zope.schema.interfaces.ISequence
zope.schema.interfaces.ISource
zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.app.form.interfaces.IDisplayWidget"
+ provides="zope.formlibwidget.interfaces.IDisplayWidget"
factory=".source.SourceSequenceDisplayWidget"
permission="zope.Public"
/>
@@ -567,7 +567,7 @@
for="zope.schema.interfaces.IAbstractSet
zope.schema.interfaces.ISource
zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.app.form.interfaces.IDisplayWidget"
+ provides="zope.formlibwidget.interfaces.IDisplayWidget"
factory=".source.SourceSequenceDisplayWidget"
permission="zope.Public"
/>
@@ -579,7 +579,7 @@
for="zope.schema.interfaces.IList
zope.schema.interfaces.ISource
zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.app.form.browser.interfaces.ISimpleInputWidget"
+ provides="zope.formlibwidget.browser.interfaces.ISimpleInputWidget"
factory=".source.SourceListInputWidget"
permission="zope.Public"
/>
Modified: Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/editview.py
===================================================================
--- Sandbox/faassen/zope.formlibwidget/src/zope/app/form/browser/editview.py 2009-12-30 16:38:32 UTC (rev 107363)
+++ Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/editview.py 2009-12-30 17:32:58 UTC (rev 107364)
@@ -32,10 +32,10 @@
from zope.browserpage import ViewPageTemplateFile
from zope.browserpage.simpleviewclass import SimpleViewClass
-from zope.app.form.interfaces import WidgetsError
-from zope.app.form.utility import setUpEditWidgets, applyWidgetsChanges
-from zope.app.form.browser.i18n import _
-from zope.app.form.browser.submit import Update
+from zope.formlibwidget.interfaces import WidgetsError
+from zope.formlibwidget.utility import setUpEditWidgets, applyWidgetsChanges
+from zope.formlibwidget.browser.i18n import _
+from zope.formlibwidget.browser.submit import Update
class EditView(BrowserView):
"""Simple edit-view base class
Modified: Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/exception.py
===================================================================
--- Sandbox/faassen/zope.formlibwidget/src/zope/app/form/browser/exception.py 2009-12-30 16:38:32 UTC (rev 107363)
+++ Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/exception.py 2009-12-30 17:32:58 UTC (rev 107364)
@@ -22,8 +22,8 @@
from zope.interface import implements
from zope.i18n import translate
-from zope.app.form.interfaces import IWidgetInputError
-from zope.app.form.browser.interfaces import IWidgetInputErrorView
+from zope.formlibwidget.interfaces import IWidgetInputError
+from zope.formlibwidget.browser.interfaces import IWidgetInputErrorView
class WidgetInputErrorView(object):
"""Display an input error as a snippet of text."""
@@ -37,7 +37,7 @@
def snippet(self):
"""Convert a widget input error to an html snippet
- >>> from zope.app.form.interfaces import WidgetInputError
+ >>> from zope.formlibwidget.interfaces import WidgetInputError
>>> class TooSmallError(object):
... def doc(self):
... return "Foo input < 1"
@@ -50,7 +50,7 @@
`doc()`. Therefore, other implementations of the interface should also
work.
- >>> from zope.app.form.interfaces import ConversionError
+ >>> from zope.formlibwidget.interfaces import ConversionError
>>> err = ConversionError('Could not convert to float.')
>>> view = WidgetInputErrorView(err, None)
>>> view.snippet()
Modified: Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/form.txt
===================================================================
--- Sandbox/faassen/zope.formlibwidget/src/zope/app/form/browser/form.txt 2009-12-30 16:38:32 UTC (rev 107363)
+++ Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/form.txt 2009-12-30 17:32:58 UTC (rev 107364)
@@ -48,7 +48,7 @@
We now imitate the form-directive's behavior and create the view class:
- >>> from zope.app.form.browser.formview import FormView
+ >>> from zope.formlibwidget.browser.formview import FormView
>>> View = type('View', (DataHandler, FormView), {'schema': IName})
To initialize the view, you still need a context and a request. The context is
@@ -105,8 +105,8 @@
>>> import zope.component
>>> context = xmlconfig.file('meta.zcml', zope.component)
- >>> import zope.app.form.browser
- >>> context = xmlconfig.file('meta.zcml', zope.app.form.browser, context)
+ >>> import zope.formlibwidget.browser
+ >>> context = xmlconfig.file('meta.zcml', zope.formlibwidget.browser, context)
Before we run the directive, make sure that no view exists:
@@ -140,8 +140,8 @@
... <view
... type="zope.publisher.interfaces.browser.IBrowserRequest"
... for="zope.schema.interfaces.ITextLine"
- ... provides="zope.app.form.interfaces.IInputWidget"
- ... factory="zope.app.form.browser.TextWidget"
+ ... provides="zope.formlibwidget.interfaces.IInputWidget"
+ ... factory="zope.formlibwidget.browser.TextWidget"
... permission="zope.Public"
... />
...
Modified: Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/formview.py
===================================================================
--- Sandbox/faassen/zope.formlibwidget/src/zope/app/form/browser/formview.py 2009-12-30 16:38:32 UTC (rev 107363)
+++ Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/formview.py 2009-12-30 17:32:58 UTC (rev 107364)
@@ -19,12 +19,12 @@
import transaction
-from zope.app.form.interfaces import WidgetsError, IInputWidget
+from zope.formlibwidget.interfaces import WidgetsError, IInputWidget
-from zope.app.form.utility import setUpWidgets, applyWidgetsChanges
-from zope.app.form.browser.editview import EditView
-from zope.app.form.browser.i18n import _
-from zope.app.form.browser.submit import Update
+from zope.formlibwidget.utility import setUpWidgets, applyWidgetsChanges
+from zope.formlibwidget.browser.editview import EditView
+from zope.formlibwidget.browser.i18n import _
+from zope.formlibwidget.browser.submit import Update
class Data(dict):
Modified: Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/i18n.py
===================================================================
--- Sandbox/faassen/zope.formlibwidget/src/zope/app/form/browser/i18n.py 2009-12-30 16:38:32 UTC (rev 107363)
+++ Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/i18n.py 2009-12-30 17:32:58 UTC (rev 107364)
@@ -1,5 +1,5 @@
"""\
-I18N support for zope.app.form.browser.
+I18N support for zope.formlibwidget.browser.
"""
__docformat__ = "reStructuredText"
Modified: Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/i18n.txt
===================================================================
--- Sandbox/faassen/zope.formlibwidget/src/zope/app/form/browser/i18n.txt 2009-12-30 16:38:32 UTC (rev 107363)
+++ Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/i18n.txt 2009-12-30 17:32:58 UTC (rev 107364)
@@ -126,11 +126,11 @@
... title=u"Kinds of coffee beans",
... source=Coffees())
>>> request = TestRequest()
- >>> widget = zope.app.form.browser.source.SourceDisplayWidget(
+ >>> widget = zope.formlibwidget.browser.source.SourceDisplayWidget(
... coffee, coffee.source, request)
>>> print widget()
Nothing
- >>> from zope.app.form.browser.interfaces import IBrowserWidget
+ >>> from zope.formlibwidget.browser.interfaces import IBrowserWidget
>>> IBrowserWidget.providedBy(widget)
True
>>> widget.setRenderedValue('arabica')
Modified: Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/interfaces.py
===================================================================
--- Sandbox/faassen/zope.formlibwidget/src/zope/app/form/browser/interfaces.py 2009-12-30 16:38:32 UTC (rev 107363)
+++ Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/interfaces.py 2009-12-30 17:32:58 UTC (rev 107364)
@@ -19,7 +19,7 @@
from zope.interface import Interface
from zope.schema import TextLine, Bool
-from zope.app.form.interfaces import IWidget, IInputWidget
+from zope.formlibwidget.interfaces import IWidget, IInputWidget
# BBB: ITerms are also used by z3c.form and possibly other form
# frameworks, so it was moved to zope.browser.interfaces and it's
Modified: Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/itemswidgets.py
===================================================================
--- Sandbox/faassen/zope.formlibwidget/src/zope/app/form/browser/itemswidgets.py 2009-12-30 16:38:32 UTC (rev 107363)
+++ Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/itemswidgets.py 2009-12-30 17:32:58 UTC (rev 107364)
@@ -24,10 +24,10 @@
from zope.schema.interfaces import ValidationError, InvalidValue
from zope.schema.interfaces import ConstraintNotSatisfied, ITitledTokenizedTerm
-from zope.app.form.browser.widget import SimpleInputWidget, renderElement
-from zope.app.form.interfaces import IInputWidget, IDisplayWidget
-from zope.app.form.interfaces import ConversionError
-from zope.app.form.browser.i18n import _
+from zope.formlibwidget.browser.widget import SimpleInputWidget, renderElement
+from zope.formlibwidget.interfaces import IInputWidget, IDisplayWidget
+from zope.formlibwidget.interfaces import ConversionError
+from zope.formlibwidget.browser.i18n import _
from zope.browserpage import ViewPageTemplateFile
Modified: Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/metaconfigure.py
===================================================================
--- Sandbox/faassen/zope.formlibwidget/src/zope/app/form/browser/metaconfigure.py 2009-12-30 16:38:32 UTC (rev 107363)
+++ Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/metaconfigure.py 2009-12-30 17:32:58 UTC (rev 107364)
@@ -30,10 +30,10 @@
from zope.publisher.interfaces.browser import IDefaultBrowserLayer
from zope.browsermenu.metaconfigure import menuItemDirective
-from zope.app.form import CustomWidgetFactory
-from zope.app.form.browser.i18n import _
-from zope.app.form.interfaces import IInputWidget, IDisplayWidget
-from zope.app.form.interfaces import IWidgetFactory
+from zope.formlibwidget import CustomWidgetFactory
+from zope.formlibwidget.browser.i18n import _
+from zope.formlibwidget.interfaces import IInputWidget, IDisplayWidget
+from zope.formlibwidget.interfaces import IWidgetFactory
from add import AddView, AddViewFactory
from editview import EditView, EditViewFactory
from formview import FormView
Modified: Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/metadirectives.py
===================================================================
--- Sandbox/faassen/zope.formlibwidget/src/zope/app/form/browser/metadirectives.py 2009-12-30 16:38:32 UTC (rev 107363)
+++ Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/metadirectives.py 2009-12-30 17:32:58 UTC (rev 107364)
@@ -241,7 +241,7 @@
being rendered. The addform directive provides a customization
interface to overcome this difficulty.
- See zope.app.form.browser.interfaces.IAddFormCustomization.
+ See zope.formlibwidget.browser.interfaces.IAddFormCustomization.
"""
description = MessageID(
Modified: Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/objectwidget.py
===================================================================
--- Sandbox/faassen/zope.formlibwidget/src/zope/app/form/browser/objectwidget.py 2009-12-30 16:38:32 UTC (rev 107363)
+++ Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/objectwidget.py 2009-12-30 17:32:58 UTC (rev 107364)
@@ -21,12 +21,12 @@
from zope.interface import implements
from zope.schema import getFieldNamesInOrder
-from zope.app.form.interfaces import IInputWidget
-from zope.app.form import InputWidget
-from zope.app.form.browser.widget import BrowserWidget
-from zope.app.form.utility import setUpWidgets, applyWidgetsChanges
+from zope.formlibwidget.interfaces import IInputWidget
+from zope.formlibwidget import InputWidget
+from zope.formlibwidget.browser.widget import BrowserWidget
+from zope.formlibwidget.utility import setUpWidgets, applyWidgetsChanges
from zope.browserpage import ViewPageTemplateFile
-from zope.app.form.browser.interfaces import IWidgetInputErrorView
+from zope.formlibwidget.browser.interfaces import IWidgetInputErrorView
class ObjectWidgetView:
Modified: Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/objectwidget.txt
===================================================================
--- Sandbox/faassen/zope.formlibwidget/src/zope/app/form/browser/objectwidget.txt 2009-12-30 16:38:32 UTC (rev 107363)
+++ Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/objectwidget.txt 2009-12-30 17:32:58 UTC (rev 107364)
@@ -97,9 +97,9 @@
>>> from zope.publisher.browser import TestRequest
>>> from zope.schema.interfaces import ITextLine
>>> from zope.schema import TextLine
- >>> from zope.app.form.browser import TextWidget
- >>> from zope.app.form.browser import ObjectWidget
- >>> from zope.app.form.interfaces import IInputWidget
+ >>> from zope.formlibwidget.browser import TextWidget
+ >>> from zope.formlibwidget.browser import ObjectWidget
+ >>> from zope.formlibwidget.interfaces import IInputWidget
Register the TextLine widget used in the IPerson interface for the field 'name'.
@@ -132,7 +132,7 @@
allready store in the family object, the factory instance will be stored
directly to the family attribute mother. For more information see the method
'applyChanges()' in the interface
-zope.app.form.browser.objectwidget.ObjectWidget.
+zope.formlibwidget.browser.objectwidget.ObjectWidget.
>>> widget.applyChanges(family)
True
Modified: Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/schemadisplay.py
===================================================================
--- Sandbox/faassen/zope.formlibwidget/src/zope/app/form/browser/schemadisplay.py 2009-12-30 16:38:32 UTC (rev 107363)
+++ Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/schemadisplay.py 2009-12-30 17:32:58 UTC (rev 107364)
@@ -24,7 +24,7 @@
from zope.schema import getFieldNamesInOrder
from zope.security.checker import defineChecker, NamesChecker
-from zope.app.form.utility import setUpDisplayWidgets
+from zope.formlibwidget.utility import setUpDisplayWidgets
from zope.browserpage import ViewPageTemplateFile
from zope.browserpage.simpleviewclass import SimpleViewClass
Modified: Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/sequencewidget.py
===================================================================
--- Sandbox/faassen/zope.formlibwidget/src/zope/app/form/browser/sequencewidget.py 2009-12-30 16:38:32 UTC (rev 107363)
+++ Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/sequencewidget.py 2009-12-30 17:32:58 UTC (rev 107364)
@@ -22,12 +22,12 @@
from zope.i18n import translate
from zope.schema.interfaces import ValidationError
-from zope.app.form.interfaces import IDisplayWidget, IInputWidget
-from zope.app.form.interfaces import WidgetInputError, MissingInputError
-from zope.app.form import InputWidget
-from zope.app.form.browser.i18n import _
-from zope.app.form.browser.widget import BrowserWidget
-from zope.app.form.browser.widget import DisplayWidget, renderElement
+from zope.formlibwidget.interfaces import IDisplayWidget, IInputWidget
+from zope.formlibwidget.interfaces import WidgetInputError, MissingInputError
+from zope.formlibwidget import InputWidget
+from zope.formlibwidget.browser.i18n import _
+from zope.formlibwidget.browser.widget import BrowserWidget
+from zope.formlibwidget.browser.widget import DisplayWidget, renderElement
from zope.browserpage import ViewPageTemplateFile
Modified: Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/source.py
===================================================================
--- Sandbox/faassen/zope.formlibwidget/src/zope/app/form/browser/source.py 2009-12-30 16:38:32 UTC (rev 107363)
+++ Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/source.py 2009-12-30 17:32:58 UTC (rev 107364)
@@ -27,21 +27,21 @@
from zope.schema.interfaces import \
ISourceQueriables, ValidationError, IVocabularyTokenized, IIterableSource
-import zope.app.form.interfaces
-import zope.app.form.browser.widget
-import zope.app.form.browser.interfaces
-from zope.app.form.interfaces import WidgetInputError, MissingInputError
-from zope.app.form.browser.i18n import _
-from zope.app.form.browser.interfaces import IWidgetInputErrorView
-from zope.app.form.browser import \
+import zope.formlibwidget.interfaces
+import zope.formlibwidget.browser.widget
+import zope.formlibwidget.browser.interfaces
+from zope.formlibwidget.interfaces import WidgetInputError, MissingInputError
+from zope.formlibwidget.browser.i18n import _
+from zope.formlibwidget.browser.interfaces import IWidgetInputErrorView
+from zope.formlibwidget.browser import \
SelectWidget, RadioWidget, MultiSelectWidget, OrderedMultiSelectWidget, \
MultiCheckBoxWidget, MultiSelectSetWidget, MultiSelectFrozenSetWidget
-import zope.app.form.browser.itemswidgets
+import zope.formlibwidget.browser.itemswidgets
-class SourceDisplayWidget(zope.app.form.browser.widget.DisplayWidget):
+class SourceDisplayWidget(zope.formlibwidget.browser.widget.DisplayWidget):
- implements(zope.app.form.interfaces.IDisplayWidget)
+ implements(zope.formlibwidget.interfaces.IDisplayWidget)
def __init__(self, field, source, request):
super(SourceDisplayWidget, self).__init__(field, request)
@@ -113,11 +113,11 @@
return '<br />\n'.join(result)
-class SourceInputWidget(zope.app.form.InputWidget):
+class SourceInputWidget(zope.formlibwidget.InputWidget):
_error = None
- implements(zope.app.form.interfaces.IInputWidget)
+ implements(zope.formlibwidget.interfaces.IInputWidget)
def __init__(self, field, source, request):
super(SourceInputWidget, self).__init__(field, request)
@@ -139,7 +139,7 @@
return [
(name, getMultiAdapter(
(source, self.request),
- zope.app.form.browser.interfaces.ISourceQueryView,
+ zope.formlibwidget.browser.interfaces.ISourceQueryView,
)
) for (name, source) in queriables]
@@ -298,7 +298,7 @@
if token is None:
if field.required:
# TODO This code path is untested.
- raise zope.app.form.interfaces.MissingInputError(
+ raise zope.formlibwidget.interfaces.MissingInputError(
field.__name__, self.label,
)
return field.missing_value
@@ -550,7 +550,7 @@
super(SourceSelectWidget, self).__init__(
field, IterableSourceVocabulary(source, request), request)
# BBB
- if not zope.app.form.browser.itemswidgets.EXPLICIT_EMPTY_SELECTION:
+ if not zope.formlibwidget.browser.itemswidgets.EXPLICIT_EMPTY_SELECTION:
# Even if the field is required, no input is needed, so don't
# worry the user about it:
self.required = False
Modified: Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/source.txt
===================================================================
--- Sandbox/faassen/zope.formlibwidget/src/zope/app/form/browser/source.txt 2009-12-30 16:38:32 UTC (rev 107363)
+++ Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/source.txt 2009-12-30 17:32:58 UTC (rev 107364)
@@ -28,7 +28,7 @@
>>> from zope.browser.interfaces import ITerms
>>> import zope.publisher.interfaces.browser
- >>> import zope.app.form.browser.interfaces
+ >>> import zope.formlibwidget.browser.interfaces
>>> from zope.schema.vocabulary import SimpleTerm
>>> class ListTerms:
...
@@ -55,7 +55,7 @@
All of the source widgets are in a single module::
- >>> import zope.app.form.browser.source
+ >>> import zope.formlibwidget.browser.source
We'll also need request objects::
@@ -97,7 +97,7 @@
view directly::
>>> request = TestRequest()
- >>> widget = zope.app.form.browser.source.SourceSelectWidget(
+ >>> widget = zope.formlibwidget.browser.source.SourceSelectWidget(
... dog, dog.source, request)
>>> print widget()
@@ -166,7 +166,7 @@
generates a selection list of size 1::
>>> request = TestRequest()
- >>> widget = zope.app.form.browser.source.SourceDropdownWidget(
+ >>> widget = zope.formlibwidget.browser.source.SourceDropdownWidget(
... dog, dog.source, request)
>>> print widget() # doctest: +ELLIPSIS
<div>
@@ -178,7 +178,7 @@
SourceRadioWidget that provides a radio button group for the items::
>>> request = TestRequest()
- >>> widget = zope.app.form.browser.source.SourceRadioWidget(
+ >>> widget = zope.formlibwidget.browser.source.SourceRadioWidget(
... dog, dog.source, request)
>>> print widget() # doctest: +NORMALIZE_WHITESPACE
<div>
@@ -202,7 +202,7 @@
>>> request.form['field.dog-empty-marker'] = '1'
>>> request.form['field.dog'] = 'bGFzc2ll'
>>>
- >>> widget = zope.app.form.browser.source.SourceRadioWidget(
+ >>> widget = zope.formlibwidget.browser.source.SourceRadioWidget(
... dog, dog.source, request)
>>> print widget() # doctest: +NORMALIZE_WHITESPACE
<div>
@@ -243,7 +243,7 @@
>>> dogs = dogs.bind(object()) # give the field a context
>>> request = TestRequest()
- >>> widget = zope.app.form.browser.source.SourceMultiSelectWidget(
+ >>> widget = zope.formlibwidget.browser.source.SourceMultiSelectWidget(
... dogs, dogSource, request)
Let's look at the rendered widget::
@@ -265,7 +265,7 @@
>>> try:
... widget.getInputValue()
- ... except zope.app.form.interfaces.MissingInputError:
+ ... except zope.formlibwidget.interfaces.MissingInputError:
... print 'no input'
no input
@@ -301,7 +301,7 @@
An alternative for small numbers of items is to use SourceMultiCheckBoxWidget::
>>> request = TestRequest()
- >>> widget = zope.app.form.browser.source.SourceMultiCheckBoxWidget(
+ >>> widget = zope.formlibwidget.browser.source.SourceMultiCheckBoxWidget(
... dogs, dogSource, request)
The rendered widget::
@@ -331,7 +331,7 @@
>>> try:
... widget.getInputValue()
- ... except zope.app.form.interfaces.MissingInputError:
+ ... except zope.formlibwidget.interfaces.MissingInputError:
... print 'no input'
no input
@@ -376,13 +376,13 @@
For list ordering support, use SourceOrderedMultiSelectWidget::
>>> request = TestRequest()
- >>> widget = zope.app.form.browser.source.SourceOrderedMultiSelectWidget(
+ >>> widget = zope.formlibwidget.browser.source.SourceOrderedMultiSelectWidget(
... dogs, dogSource, request)
The widget is too complicated to show in complete rendered form here.
Insted, we'll inspect the properties of the widget::
- >>> from zope.app.form.interfaces import MissingInputError
+ >>> from zope.formlibwidget.interfaces import MissingInputError
>>> try:
... widget.getInputValue()
... except MissingInputError:
@@ -433,12 +433,12 @@
... )
>>> dogSet = dogSet.bind(object()) # give the field a context
>>> request = TestRequest()
- >>> widget = zope.app.form.browser.source.SourceMultiSelectSetWidget(
+ >>> widget = zope.formlibwidget.browser.source.SourceMultiSelectSetWidget(
... dogSet, dogSource, request)
>>> try:
... widget.getInputValue()
- ... except zope.app.form.interfaces.MissingInputError:
+ ... except zope.formlibwidget.interfaces.MissingInputError:
... print 'no input'
no input
@@ -508,7 +508,7 @@
source itself is assumed to be queriable.
- For each queriable found, a
- `zope.app.form.browser.interfaces.ISourceQueryView` view is looked up. This
+ `zope.formlibwidget.browser.interfaces.ISourceQueryView` view is looked up. This
view is used to obtain the HTML for displaying a query form. The view is also
used to obtain search results.
@@ -531,7 +531,7 @@
>>> class ListQueryView:
...
... zope.interface.implements(
- ... zope.app.form.browser.interfaces.ISourceQueryView)
+ ... zope.formlibwidget.browser.interfaces.ISourceQueryView)
... zope.component.adapts(
... SourceList,
... zope.publisher.interfaces.browser.IBrowserRequest,
@@ -571,7 +571,7 @@
As before, we'll just create the view directly::
>>> request = TestRequest()
- >>> widget = zope.app.form.browser.source.SourceInputWidget(
+ >>> widget = zope.formlibwidget.browser.source.SourceInputWidget(
... dog, dog.source, request)
Now if we render the widget, we'll see the input value (initially nothing) and
@@ -745,7 +745,7 @@
and a widget::
- >>> widget = zope.app.form.browser.source.SourceInputWidget(
+ >>> widget = zope.formlibwidget.browser.source.SourceInputWidget(
... pet, pet.source, request)
Now if we display the widget, we'll see search inputs for both dogs
@@ -875,11 +875,11 @@
values::
>>> request = TestRequest()
- >>> widget = zope.app.form.browser.source.SourceDisplayWidget(
+ >>> widget = zope.formlibwidget.browser.source.SourceDisplayWidget(
... pet, pet.source, request)
>>> print widget()
Nothing
- >>> from zope.app.form.browser.interfaces import IBrowserWidget
+ >>> from zope.formlibwidget.browser.interfaces import IBrowserWidget
>>> IBrowserWidget.providedBy(widget)
True
@@ -901,7 +901,7 @@
and the source, where, in this case, the field is a list field. We'll just call
the widget factory directly::
- >>> widget = zope.app.form.browser.source.SourceListInputWidget(
+ >>> widget = zope.formlibwidget.browser.source.SourceListInputWidget(
... pets, pets.value_type.source, request)
If we render the widget::
@@ -1089,7 +1089,7 @@
... TestTerms,
... (TestSource, zope.publisher.interfaces.browser.IBrowserRequest))
- >>> from zope.app.form.browser.source import IterableSourceVocabulary
+ >>> from zope.formlibwidget.browser.source import IterableSourceVocabulary
>>> request = TestRequest()
>>> vocab = IterableSourceVocabulary(source, request)
>>> from zope.interface.verify import verifyClass, verifyObject
Modified: Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/registerWidgets.zcml
===================================================================
--- Sandbox/faassen/zope.formlibwidget/src/zope/app/form/browser/tests/registerWidgets.zcml 2009-12-30 16:38:32 UTC (rev 107363)
+++ Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/registerWidgets.zcml 2009-12-30 17:32:58 UTC (rev 107364)
@@ -5,6 +5,6 @@
<include package="zope.component" file="meta.zcml" />
<include package="zope.security" file="meta.zcml" />
<include package="zope.browserpage" file="meta.zcml" />
- <include package="zope.app.form.browser" file="configure.zcml" />
+ <include package="zope.formlibwidget.browser" file="configure.zcml" />
</configure>
Modified: Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/support.py
===================================================================
--- Sandbox/faassen/zope.formlibwidget/src/zope/app/form/browser/tests/support.py 2009-12-30 16:38:32 UTC (rev 107363)
+++ Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/support.py 2009-12-30 17:32:58 UTC (rev 107364)
@@ -50,7 +50,7 @@
widgetsXml.append(' />')
xmlconfig.string("""
<configure xmlns="http://namespaces.zope.org/browser">
- <include package="zope.app.form.browser" file="meta.zcml" />
+ <include package="zope.formlibwidget.browser" file="meta.zcml" />
<editform
name="edit.html"
schema="%s"
Modified: Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_add.py
===================================================================
--- Sandbox/faassen/zope.formlibwidget/src/zope/app/form/browser/tests/test_add.py 2009-12-30 16:38:32 UTC (rev 107363)
+++ Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_add.py 2009-12-30 17:32:58 UTC (rev 107364)
@@ -32,16 +32,16 @@
from zope.security.checker import CheckerPublic
from zope.site.site import SiteManagerAdapter
-from zope.app.form import CustomWidgetFactory
-from zope.app.form.browser import TextWidget as Text
-from zope.app.form.browser.add import AddViewFactory, AddView
-from zope.app.form.browser.metaconfigure import AddFormDirective
-from zope.app.form.browser.submit import Update
+from zope.formlibwidget import CustomWidgetFactory
+from zope.formlibwidget.browser import TextWidget as Text
+from zope.formlibwidget.browser.add import AddViewFactory, AddView
+from zope.formlibwidget.browser.metaconfigure import AddFormDirective
+from zope.formlibwidget.browser.submit import Update
from zope.app.testing import ztapi
# 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
+from zope.formlibwidget.browser.tests.test_editview import IFoo, IBar, Foo
+from zope.formlibwidget.browser.tests.test_editview import FooBarAdapter
from zope.component.testing import PlacelessSetup as CAPlacelessSetup
from zope.component.eventtesting import PlacelessSetup as EventPlacelessSetup
Modified: Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_browserwidget.py
===================================================================
--- Sandbox/faassen/zope.formlibwidget/src/zope/app/form/browser/tests/test_browserwidget.py 2009-12-30 16:38:32 UTC (rev 107363)
+++ Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_browserwidget.py 2009-12-30 17:32:58 UTC (rev 107364)
@@ -20,12 +20,12 @@
from zope.interface import Interface, implements
from zope.publisher.browser import TestRequest
from zope.schema import Text, Int
-from zope.testing.doctest import DocTestSuite
+from doctest import DocTestSuite
-from zope.app.form.browser.widget import SimpleInputWidget
-from zope.app.form.browser.tests import support
-from zope.app.form.interfaces import ConversionError
-from zope.app.form.interfaces import WidgetInputError, MissingInputError
+from zope.formlibwidget.browser.widget import SimpleInputWidget
+from zope.formlibwidget.browser.tests import support
+from zope.formlibwidget.interfaces import ConversionError
+from zope.formlibwidget.interfaces import WidgetInputError, MissingInputError
class BrowserWidgetTest(PlacelessSetup,
@@ -207,7 +207,7 @@
def test_suite():
suite = unittest.TestSuite()
suite.addTest(unittest.makeSuite(Test))
- suite.addTest(DocTestSuite("zope.app.form.browser.widget"))
+ suite.addTest(DocTestSuite("zope.formlibwidget.browser.widget"))
return suite
if __name__ == '__main__':
Modified: Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_checkboxwidget.py
===================================================================
--- Sandbox/faassen/zope.formlibwidget/src/zope/app/form/browser/tests/test_checkboxwidget.py 2009-12-30 16:38:32 UTC (rev 107363)
+++ Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_checkboxwidget.py 2009-12-30 17:32:58 UTC (rev 107364)
@@ -16,15 +16,15 @@
$Id$
"""
import unittest
-from zope.testing import doctest
-from zope.app.form.interfaces import IInputWidget
-from zope.app.form.browser import CheckBoxWidget
+import doctest
+from zope.formlibwidget.interfaces import IInputWidget
+from zope.formlibwidget.browser import CheckBoxWidget
from zope.publisher.browser import TestRequest
from zope.schema import Bool
from zope.interface.verify import verifyClass
-from zope.app.form.interfaces import MissingInputError
-from zope.app.form.browser.tests.test_browserwidget import SimpleInputWidgetTest
+from zope.formlibwidget.interfaces import MissingInputError
+from zope.formlibwidget.browser.tests.test_browserwidget import SimpleInputWidgetTest
class CheckBoxWidgetTest(SimpleInputWidgetTest):
Modified: Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_choicecollections.py
===================================================================
--- Sandbox/faassen/zope.formlibwidget/src/zope/app/form/browser/tests/test_choicecollections.py 2009-12-30 16:38:32 UTC (rev 107363)
+++ Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_choicecollections.py 2009-12-30 17:32:58 UTC (rev 107364)
@@ -23,12 +23,12 @@
from zope.schema import Choice, List
from zope.app.testing import ztapi
-from zope.app.form.interfaces import IInputWidget, IDisplayWidget
-from zope.app.form.browser import CollectionDisplayWidget
-from zope.app.form.browser import CollectionInputWidget
-from zope.app.form.browser import ChoiceCollectionDisplayWidget
-from zope.app.form.browser import ChoiceCollectionInputWidget
-from zope.app.form.browser import ItemsMultiDisplayWidget, SelectWidget
+from zope.formlibwidget.interfaces import IInputWidget, IDisplayWidget
+from zope.formlibwidget.browser import CollectionDisplayWidget
+from zope.formlibwidget.browser import CollectionInputWidget
+from zope.formlibwidget.browser import ChoiceCollectionDisplayWidget
+from zope.formlibwidget.browser import ChoiceCollectionInputWidget
+from zope.formlibwidget.browser import ItemsMultiDisplayWidget, SelectWidget
class ListOfChoicesWidgetTest(PlacelessSetup, unittest.TestCase):
Modified: Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_choicewidget.py
===================================================================
--- Sandbox/faassen/zope.formlibwidget/src/zope/app/form/browser/tests/test_choicewidget.py 2009-12-30 16:38:32 UTC (rev 107363)
+++ Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_choicewidget.py 2009-12-30 17:32:58 UTC (rev 107364)
@@ -23,9 +23,9 @@
from zope.schema import Choice
from zope.app.testing import ztapi
-from zope.app.form.interfaces import IInputWidget, IDisplayWidget
-from zope.app.form.browser import ChoiceDisplayWidget, ChoiceInputWidget
-from zope.app.form.browser import ItemDisplayWidget, DropdownWidget
+from zope.formlibwidget.interfaces import IInputWidget, IDisplayWidget
+from zope.formlibwidget.browser import ChoiceDisplayWidget, ChoiceInputWidget
+from zope.formlibwidget.browser import ItemDisplayWidget, DropdownWidget
class ChoiceWidgetTest(PlacelessSetup, unittest.TestCase):
Modified: Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_datetimewidget.py
===================================================================
--- Sandbox/faassen/zope.formlibwidget/src/zope/app/form/browser/tests/test_datetimewidget.py 2009-12-30 16:38:32 UTC (rev 107363)
+++ Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_datetimewidget.py 2009-12-30 17:32:58 UTC (rev 107364)
@@ -17,17 +17,17 @@
"""
import datetime
import unittest
-from zope.testing import doctest
+import doctest
from zope.schema import Datetime
from zope.datetime import parseDatetimetz, tzinfo
from zope.interface.verify import verifyClass
-from zope.app.form.browser.tests.test_browserwidget import SimpleInputWidgetTest
-from zope.app.form.interfaces import IInputWidget
-from zope.app.form.browser import DatetimeWidget
-from zope.app.form.browser import DatetimeI18nWidget
-from zope.app.form.interfaces import ConversionError, WidgetInputError
+from zope.formlibwidget.browser.tests.test_browserwidget import SimpleInputWidgetTest
+from zope.formlibwidget.interfaces import IInputWidget
+from zope.formlibwidget.browser import DatetimeWidget
+from zope.formlibwidget.browser import DatetimeI18nWidget
+from zope.formlibwidget.interfaces import ConversionError, WidgetInputError
class DatetimeWidgetTest(SimpleInputWidgetTest):
Modified: Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_datewidget.py
===================================================================
--- Sandbox/faassen/zope.formlibwidget/src/zope/app/form/browser/tests/test_datewidget.py 2009-12-30 16:38:32 UTC (rev 107363)
+++ Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_datewidget.py 2009-12-30 17:32:58 UTC (rev 107364)
@@ -17,16 +17,16 @@
"""
import datetime
import unittest
-from zope.testing import doctest
+import doctest
from zope.datetime import parseDatetimetz
from zope.schema import Date
from zope.interface.verify import verifyClass
-from zope.app.form.browser.tests.test_browserwidget import SimpleInputWidgetTest
-from zope.app.form.interfaces import IInputWidget
-from zope.app.form.browser import DateWidget
-from zope.app.form.browser import DateI18nWidget
-from zope.app.form.interfaces import ConversionError, WidgetInputError
+from zope.formlibwidget.browser.tests.test_browserwidget import SimpleInputWidgetTest
+from zope.formlibwidget.interfaces import IInputWidget
+from zope.formlibwidget.browser import DateWidget
+from zope.formlibwidget.browser import DateI18nWidget
+from zope.formlibwidget.interfaces import ConversionError, WidgetInputError
class DateWidgetTest(SimpleInputWidgetTest):
Modified: Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_decimalwidget.py
===================================================================
--- Sandbox/faassen/zope.formlibwidget/src/zope/app/form/browser/tests/test_decimalwidget.py 2009-12-30 16:38:32 UTC (rev 107363)
+++ Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_decimalwidget.py 2009-12-30 17:32:58 UTC (rev 107364)
@@ -17,11 +17,11 @@
"""
import unittest
import decimal
-from zope.testing import doctest
-from zope.app.form.browser.tests.test_browserwidget import SimpleInputWidgetTest
-from zope.app.form.interfaces import IInputWidget
-from zope.app.form.browser import DecimalWidget
-from zope.app.form.interfaces import ConversionError, WidgetInputError
+import doctest
+from zope.formlibwidget.browser.tests.test_browserwidget import SimpleInputWidgetTest
+from zope.formlibwidget.interfaces import IInputWidget
+from zope.formlibwidget.browser import DecimalWidget
+from zope.formlibwidget.interfaces import ConversionError, WidgetInputError
from zope.interface.verify import verifyClass
from zope.schema import Decimal
Modified: Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_directives.py
===================================================================
--- Sandbox/faassen/zope.formlibwidget/src/zope/app/form/browser/tests/test_directives.py 2009-12-30 16:38:32 UTC (rev 107363)
+++ Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_directives.py 2009-12-30 17:32:58 UTC (rev 107364)
@@ -26,8 +26,8 @@
from zope.publisher.browser import TestRequest
from zope.schema import TextLine, Int
-from zope.app.form.browser import TextWidget
-from zope.app.form.tests import utils
+from zope.formlibwidget.browser import TextWidget
+from zope.formlibwidget.tests import utils
template = """<configure
xmlns='http://namespaces.zope.org/zope'
@@ -70,8 +70,8 @@
super(Test, self).setUp()
import zope.component
XMLConfig('meta.zcml', zope.component)()
- import zope.app.form.browser
- XMLConfig('meta.zcml', zope.app.form.browser)()
+ import zope.formlibwidget.browser
+ XMLConfig('meta.zcml', zope.formlibwidget.browser)()
import zope.browsermenu
XMLConfig('meta.zcml', zope.browsermenu)()
@@ -88,14 +88,14 @@
<view
type="zope.publisher.interfaces.browser.IBrowserRequest"
for="zope.schema.interfaces.ITextLine"
- provides="zope.app.form.interfaces.IInputWidget"
- factory="zope.app.form.browser.TextWidget"
+ provides="zope.formlibwidget.interfaces.IInputWidget"
+ factory="zope.formlibwidget.browser.TextWidget"
permission="zope.Public"
/>
<browser:addform
- for="zope.app.form.browser.tests.test_directives.IC"
- schema="zope.app.form.browser.tests.test_directives.Schema"
+ for="zope.formlibwidget.browser.tests.test_directives.IC"
+ schema="zope.formlibwidget.browser.tests.test_directives.Schema"
name="add.html"
label="Add a ZPT page"
fields="text"
@@ -114,14 +114,14 @@
<view
type="zope.publisher.interfaces.browser.IBrowserRequest"
for="zope.schema.interfaces.ITextLine"
- provides="zope.app.form.interfaces.IInputWidget"
- factory="zope.app.form.browser.TextWidget"
+ provides="zope.formlibwidget.interfaces.IInputWidget"
+ factory="zope.formlibwidget.browser.TextWidget"
permission="zope.Public"
/>
<browser:editform
- for="zope.app.form.browser.tests.test_directives.IC"
- schema="zope.app.form.browser.tests.test_directives.Schema"
+ for="zope.formlibwidget.browser.tests.test_directives.IC"
+ schema="zope.formlibwidget.browser.tests.test_directives.Schema"
name="edit.html"
label="Edit a ZPT page"
fields="text"
@@ -141,13 +141,13 @@
<view
type="zope.publisher.interfaces.browser.IBrowserRequest"
for="zope.schema.interfaces.ITextLine"
- provides="zope.app.form.interfaces.IInputWidget"
- factory="zope.app.form.browser.TextWidget"
+ provides="zope.formlibwidget.interfaces.IInputWidget"
+ factory="zope.formlibwidget.browser.TextWidget"
permission="zope.Public"
/>
<browser:editform
- for="zope.app.form.browser.tests.test_directives.IC"
- schema="zope.app.form.browser.tests.test_directives.Schema"
+ for="zope.formlibwidget.browser.tests.test_directives.IC"
+ schema="zope.formlibwidget.browser.tests.test_directives.Schema"
name="edit.html"
label="Edit a ZPT page"
fields="text"
@@ -169,14 +169,14 @@
<view
type="zope.publisher.interfaces.browser.IBrowserRequest"
for="zope.schema.interfaces.IField"
- provides="zope.app.form.interfaces.IDisplayWidget"
- factory="zope.app.form.browser.DisplayWidget"
+ provides="zope.formlibwidget.interfaces.IDisplayWidget"
+ factory="zope.formlibwidget.browser.DisplayWidget"
permission="zope.Public"
/>
<browser:schemadisplay
- for="zope.app.form.browser.tests.test_directives.IC"
- schema="zope.app.form.browser.tests.test_directives.Schema"
+ for="zope.formlibwidget.browser.tests.test_directives.IC"
+ schema="zope.formlibwidget.browser.tests.test_directives.Schema"
name="view.html"
label="View a ZPT page"
fields="text"
@@ -195,14 +195,14 @@
<view
type="zope.publisher.interfaces.browser.IBrowserRequest"
for="zope.schema.interfaces.ITextLine"
- provides="zope.app.form.interfaces.IInputWidget"
- factory="zope.app.form.browser.TextWidget"
+ provides="zope.formlibwidget.interfaces.IInputWidget"
+ factory="zope.formlibwidget.browser.TextWidget"
permission="zope.Public"
/>
<browser:addform
- for="zope.app.form.browser.tests.test_directives.IC"
- schema="zope.app.form.browser.tests.test_directives.Schema"
+ for="zope.formlibwidget.browser.tests.test_directives.IC"
+ schema="zope.formlibwidget.browser.tests.test_directives.Schema"
name="add.html"
label="Add a ZPT page"
fields="text"
@@ -210,7 +210,7 @@
<widget
field="text"
- class="zope.app.form.browser.tests.test_directives.SomeWidget"
+ class="zope.formlibwidget.browser.tests.test_directives.SomeWidget"
displayWidth="30"
extra="foo"
/>
@@ -233,14 +233,14 @@
<view
type="zope.publisher.interfaces.browser.IBrowserRequest"
for="zope.schema.interfaces.ITextLine"
- provides="zope.app.form.interfaces.IInputWidget"
- factory="zope.app.form.browser.TextWidget"
+ provides="zope.formlibwidget.interfaces.IInputWidget"
+ factory="zope.formlibwidget.browser.TextWidget"
permission="zope.Public"
/>
<browser:editform
- for="zope.app.form.browser.tests.test_directives.IC"
- schema="zope.app.form.browser.tests.test_directives.Schema"
+ for="zope.formlibwidget.browser.tests.test_directives.IC"
+ schema="zope.formlibwidget.browser.tests.test_directives.Schema"
name="edit.html"
label="Edit a ZPT page"
fields="text"
@@ -248,7 +248,7 @@
<widget
field="text"
- class="zope.app.form.browser.tests.test_directives.SomeWidget"
+ class="zope.formlibwidget.browser.tests.test_directives.SomeWidget"
displayWidth="30"
extra="foo"
/>
@@ -270,14 +270,14 @@
<view
type="zope.publisher.interfaces.browser.IBrowserRequest"
for="zope.schema.interfaces.IField"
- provides="zope.app.form.interfaces.IDisplayWidget"
- factory="zope.app.form.browser.DisplayWidget"
+ provides="zope.formlibwidget.interfaces.IDisplayWidget"
+ factory="zope.formlibwidget.browser.DisplayWidget"
permission="zope.Public"
/>
<browser:schemadisplay
- for="zope.app.form.browser.tests.test_directives.IC"
- schema="zope.app.form.browser.tests.test_directives.Schema"
+ for="zope.formlibwidget.browser.tests.test_directives.IC"
+ schema="zope.formlibwidget.browser.tests.test_directives.Schema"
name="view.html"
label="View a ZPT page"
fields="text"
@@ -285,7 +285,7 @@
<browser:widget
field="text"
- class="zope.app.form.browser.tests.test_directives.SomeWidget"
+ class="zope.formlibwidget.browser.tests.test_directives.SomeWidget"
displayWidth="30"
extra="foo"
/>
Modified: Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_displaywidget.py
===================================================================
--- Sandbox/faassen/zope.formlibwidget/src/zope/app/form/browser/tests/test_displaywidget.py 2009-12-30 16:38:32 UTC (rev 107363)
+++ Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_displaywidget.py 2009-12-30 17:32:58 UTC (rev 107364)
@@ -20,9 +20,9 @@
from zope.interface.exceptions import DoesNotImplement
from zope.publisher.browser import TestRequest
from zope.schema import TextLine
-from zope.testing.doctest import DocTestSuite
+from doctest import DocTestSuite
-from zope.app.form.browser.widget import DisplayWidget, UnicodeDisplayWidget
+from zope.formlibwidget.browser.widget import DisplayWidget, UnicodeDisplayWidget
def test_implemented_interfaces():
@@ -31,14 +31,14 @@
Like all browser-used widgets, DisplayWidget must implement
`IBrowserWidget`.
- >>> from zope.app.form.browser.interfaces import IBrowserWidget
+ >>> from zope.formlibwidget.browser.interfaces import IBrowserWidget
>>> verifyClass(IBrowserWidget, DisplayWidget)
True
But unlike most other widgets in this package, the display widget is *not*
an `IInputWidget`.
- >>> from zope.app.form.interfaces import IInputWidget
+ >>> from zope.formlibwidget.interfaces import IInputWidget
>>> try:
... verifyClass(IInputWidget, DisplayWidget)
... except DoesNotImplement:
Modified: Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_editview.py
===================================================================
--- Sandbox/faassen/zope.formlibwidget/src/zope/app/form/browser/tests/test_editview.py 2009-12-30 16:38:32 UTC (rev 107363)
+++ Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_editview.py 2009-12-30 17:32:58 UTC (rev 107364)
@@ -27,11 +27,11 @@
from zope.app.testing import ztapi
-from zope.app.form.browser import TextWidget
-from zope.app.form.browser.editview import EditView
-from zope.app.form.browser.submit import Update
-from zope.app.form.interfaces import IInputWidget
-from zope.app.form.tests import utils
+from zope.formlibwidget.browser import TextWidget
+from zope.formlibwidget.browser.editview import EditView
+from zope.formlibwidget.browser.submit import Update
+from zope.formlibwidget.interfaces import IInputWidget
+from zope.formlibwidget.tests import utils
class I(Interface):
foo = TextLine(title=u"Foo")
Modified: Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_exception.py
===================================================================
--- Sandbox/faassen/zope.formlibwidget/src/zope/app/form/browser/tests/test_exception.py 2009-12-30 16:38:32 UTC (rev 107363)
+++ Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_exception.py 2009-12-30 17:32:58 UTC (rev 107364)
@@ -16,11 +16,11 @@
$Id$
"""
import unittest
-from zope.testing.doctest import DocTestSuite
+from doctest import DocTestSuite
def test_suite():
return unittest.TestSuite((
- DocTestSuite('zope.app.form.browser.exception'),
+ DocTestSuite('zope.formlibwidget.browser.exception'),
))
if __name__ == '__main__':
Modified: Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_filewidget.py
===================================================================
--- Sandbox/faassen/zope.formlibwidget/src/zope/app/form/browser/tests/test_filewidget.py 2009-12-30 16:38:32 UTC (rev 107363)
+++ Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_filewidget.py 2009-12-30 17:32:58 UTC (rev 107364)
@@ -17,12 +17,12 @@
"""
import unittest
-from zope.testing import doctest
+import doctest
from StringIO import StringIO
-from zope.app.form.interfaces import IInputWidget
-from zope.app.form.browser import FileWidget
+from zope.formlibwidget.interfaces import IInputWidget
+from zope.formlibwidget.browser import FileWidget
-from zope.app.form.browser.tests.test_browserwidget import (
+from zope.formlibwidget.browser.tests.test_browserwidget import (
SimpleInputWidgetTest)
from zope.interface.verify import verifyClass
Modified: Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_floatwidget.py
===================================================================
--- Sandbox/faassen/zope.formlibwidget/src/zope/app/form/browser/tests/test_floatwidget.py 2009-12-30 16:38:32 UTC (rev 107363)
+++ Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_floatwidget.py 2009-12-30 17:32:58 UTC (rev 107364)
@@ -16,11 +16,11 @@
$Id$
"""
import unittest
-from zope.testing import doctest
-from zope.app.form.browser.tests.test_browserwidget import SimpleInputWidgetTest
-from zope.app.form.interfaces import IInputWidget
-from zope.app.form.browser import FloatWidget
-from zope.app.form.interfaces import ConversionError, WidgetInputError
+import doctest
+from zope.formlibwidget.browser.tests.test_browserwidget import SimpleInputWidgetTest
+from zope.formlibwidget.interfaces import IInputWidget
+from zope.formlibwidget.browser import FloatWidget
+from zope.formlibwidget.interfaces import ConversionError, WidgetInputError
from zope.interface.verify import verifyClass
from zope.schema import Float
Modified: Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_form.py
===================================================================
--- Sandbox/faassen/zope.formlibwidget/src/zope/app/form/browser/tests/test_form.py 2009-12-30 16:38:32 UTC (rev 107363)
+++ Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_form.py 2009-12-30 17:32:58 UTC (rev 107364)
@@ -18,13 +18,13 @@
import unittest
from zope.schema.interfaces import ITextLine
-from zope.testing import doctest, doctest
+import doctest
from zope.component import testing
from zope.app.testing import ztapi
-from zope.app.form.browser import TextWidget
-from zope.app.form.interfaces import IInputWidget
+from zope.formlibwidget.browser import TextWidget
+from zope.formlibwidget.interfaces import IInputWidget
def setUp(test):
testing.setUp()
Modified: Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_functional_booleanradiowidget.py
===================================================================
--- Sandbox/faassen/zope.formlibwidget/src/zope/app/form/browser/tests/test_functional_booleanradiowidget.py 2009-12-30 16:38:32 UTC (rev 107363)
+++ Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_functional_booleanradiowidget.py 2009-12-30 17:32:58 UTC (rev 107364)
@@ -24,8 +24,8 @@
from zope.schema import Bool
from zope.traversing.api import traverse
-from zope.app.form.testing import AppFormLayer
-from zope.app.form.browser.tests.support import *
+from zope.formlibwidget.testing import AppFormLayer
+from zope.formlibwidget.browser.tests.support import *
from zope.app.testing.functional import BrowserTestCase
class IFoo(Interface):
@@ -44,7 +44,7 @@
def setUp(self):
BrowserTestCase.setUp(self)
registerEditForm(IFoo, widgets={
- 'bar': { 'class': 'zope.app.form.browser.BooleanRadioWidget' }})
+ 'bar': { 'class': 'zope.formlibwidget.browser.BooleanRadioWidget' }})
defineSecurity(Foo, IFoo)
def test_display_editform(self):
Modified: Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_functional_checkboxwidget.py
===================================================================
--- Sandbox/faassen/zope.formlibwidget/src/zope/app/form/browser/tests/test_functional_checkboxwidget.py 2009-12-30 16:38:32 UTC (rev 107363)
+++ Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_functional_checkboxwidget.py 2009-12-30 17:32:58 UTC (rev 107364)
@@ -24,9 +24,9 @@
from zope.schema import Bool
from zope.traversing.api import traverse
-from zope.app.form.testing import AppFormLayer
-from zope.app.form.browser import CheckBoxWidget
-from zope.app.form.browser.tests.support import *
+from zope.formlibwidget.testing import AppFormLayer
+from zope.formlibwidget.browser import CheckBoxWidget
+from zope.formlibwidget.browser.tests.support import *
from zope.app.testing.functional import BrowserTestCase
class IBoolTest(Interface):
Modified: Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_functional_datetimewidget.py
===================================================================
--- Sandbox/faassen/zope.formlibwidget/src/zope/app/form/browser/tests/test_functional_datetimewidget.py 2009-12-30 16:38:32 UTC (rev 107363)
+++ Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_functional_datetimewidget.py 2009-12-30 17:32:58 UTC (rev 107364)
@@ -27,8 +27,8 @@
from zope.schema import Datetime, Choice
from zope.traversing.api import traverse
-from zope.app.form.testing import AppFormLayer
-from zope.app.form.browser.tests.support import *
+from zope.formlibwidget.testing import AppFormLayer
+from zope.formlibwidget.browser.tests.support import *
from zope.app.testing.functional import BrowserTestCase
Modified: Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_functional_decimalwidget.py
===================================================================
--- Sandbox/faassen/zope.formlibwidget/src/zope/app/form/browser/tests/test_functional_decimalwidget.py 2009-12-30 16:38:32 UTC (rev 107363)
+++ Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_functional_decimalwidget.py 2009-12-30 17:32:58 UTC (rev 107364)
@@ -25,8 +25,8 @@
from zope.traversing.api import traverse
from zope.schema import Decimal, Choice
-from zope.app.form.testing import AppFormLayer
-from zope.app.form.browser.tests.support import *
+from zope.formlibwidget.testing import AppFormLayer
+from zope.formlibwidget.browser.tests.support import *
from zope.app.testing.functional import BrowserTestCase
class IDecimalTest(Interface):
Modified: Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_functional_editview.py
===================================================================
--- Sandbox/faassen/zope.formlibwidget/src/zope/app/form/browser/tests/test_functional_editview.py 2009-12-30 16:38:32 UTC (rev 107363)
+++ Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_functional_editview.py 2009-12-30 17:32:58 UTC (rev 107364)
@@ -24,9 +24,9 @@
from zope.schema import TextLine
from zope.traversing.api import traverse
-from zope.app.form.browser.editview import EditView
-from zope.app.form.testing import AppFormLayer
-from zope.app.form.browser.tests.support import *
+from zope.formlibwidget.browser.editview import EditView
+from zope.formlibwidget.testing import AppFormLayer
+from zope.formlibwidget.browser.tests.support import *
from zope.app.testing.functional import BrowserTestCase
class IFoo(Interface):
Modified: Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_functional_filewidget.py
===================================================================
--- Sandbox/faassen/zope.formlibwidget/src/zope/app/form/browser/tests/test_functional_filewidget.py 2009-12-30 16:38:32 UTC (rev 107363)
+++ Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_functional_filewidget.py 2009-12-30 17:32:58 UTC (rev 107364)
@@ -26,11 +26,11 @@
from zope.schema import Field
from zope.traversing.api import traverse
-from zope.app.form.testing import AppFormLayer
-from zope.app.form.browser.textwidgets import FileWidget
-from zope.app.form.browser.tests.support import *
+from zope.formlibwidget.testing import AppFormLayer
+from zope.formlibwidget.browser.textwidgets import FileWidget
+from zope.formlibwidget.browser.tests.support import *
from zope.app.testing.functional import BrowserTestCase
-from zope.app.form.interfaces import IInputWidget
+from zope.formlibwidget.interfaces import IInputWidget
class IFileField(IField):
"""Field for representing a file that can be edited by FileWidget."""
Modified: Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_functional_floatwidget.py
===================================================================
--- Sandbox/faassen/zope.formlibwidget/src/zope/app/form/browser/tests/test_functional_floatwidget.py 2009-12-30 16:38:32 UTC (rev 107363)
+++ Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_functional_floatwidget.py 2009-12-30 17:32:58 UTC (rev 107364)
@@ -24,8 +24,8 @@
from zope.traversing.api import traverse
from zope.schema import Float, Choice
-from zope.app.form.testing import AppFormLayer
-from zope.app.form.browser.tests.support import *
+from zope.formlibwidget.testing import AppFormLayer
+from zope.formlibwidget.browser.tests.support import *
from zope.app.testing.functional import BrowserTestCase
class IFloatTest(Interface):
Modified: Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_functional_i18n.py
===================================================================
--- Sandbox/faassen/zope.formlibwidget/src/zope/app/form/browser/tests/test_functional_i18n.py 2009-12-30 16:38:32 UTC (rev 107363)
+++ Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_functional_i18n.py 2009-12-30 17:32:58 UTC (rev 107364)
@@ -18,13 +18,14 @@
import re
import unittest
+import doctest
from persistent import Persistent
-from zope.testing import renormalizing, doctest
+from zope.testing import renormalizing
from zope.interface import Interface, implements
from zope.schema import TextLine, Text, Int, List
from zope.i18nmessageid import MessageFactory
from zope.app.testing.functional import FunctionalDocFileSuite
-from zope.app.form.testing import AppFormLayer
+from zope.formlibwidget.testing import AppFormLayer
_ = MessageFactory('formtest')
@@ -72,7 +73,7 @@
def test_suite():
- i18n = FunctionalDocFileSuite('i18n.txt', package='zope.app.form.browser',
+ i18n = FunctionalDocFileSuite('i18n.txt', package='zope.formlibwidget.browser',
checker=checker)
i18n.layer = AppFormLayer
return unittest.TestSuite([
Modified: Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_functional_intwidget.py
===================================================================
--- Sandbox/faassen/zope.formlibwidget/src/zope/app/form/browser/tests/test_functional_intwidget.py 2009-12-30 16:38:32 UTC (rev 107363)
+++ Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_functional_intwidget.py 2009-12-30 17:32:58 UTC (rev 107364)
@@ -24,9 +24,9 @@
from zope.schema import Int, Choice
from zope.traversing.api import traverse
-from zope.app.form.testing import AppFormLayer
+from zope.formlibwidget.testing import AppFormLayer
from zope.app.testing.functional import BrowserTestCase
-from zope.app.form.browser.tests.support import *
+from zope.formlibwidget.browser.tests.support import *
class IIntTest(Interface):
Modified: Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_functional_objectwidget.py
===================================================================
--- Sandbox/faassen/zope.formlibwidget/src/zope/app/form/browser/tests/test_functional_objectwidget.py 2009-12-30 16:38:32 UTC (rev 107363)
+++ Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_functional_objectwidget.py 2009-12-30 17:32:58 UTC (rev 107364)
@@ -21,8 +21,8 @@
from zope.interface import Interface, implements
from zope.publisher.browser import TestRequest
from zope.schema import Object, TextLine
-from zope.app.form.browser import ObjectWidget
-from zope.app.form.browser.tests import support
+from zope.formlibwidget.browser import ObjectWidget
+from zope.formlibwidget.browser.tests import support
class ITestContact(Interface):
name = TextLine()
@@ -35,8 +35,8 @@
def setUp(self):
PlacelessSetup.setUp(self)
- import zope.app.form
- XMLConfig('ftesting.zcml', zope.app.form)()
+ import zope.formlibwidget
+ XMLConfig('ftesting.zcml', zope.formlibwidget)()
self.field = Object(ITestContact, __name__=u'foo')
def test_new(self):
Modified: Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_functional_selectwidget.py
===================================================================
--- Sandbox/faassen/zope.formlibwidget/src/zope/app/form/browser/tests/test_functional_selectwidget.py 2009-12-30 16:38:32 UTC (rev 107363)
+++ Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_functional_selectwidget.py 2009-12-30 17:32:58 UTC (rev 107364)
@@ -24,8 +24,8 @@
from zope.schema import TextLine, Choice
from zope.traversing.api import traverse
-from zope.app.form.testing import AppFormLayer
-from zope.app.form.browser.tests.support import *
+from zope.formlibwidget.testing import AppFormLayer
+from zope.formlibwidget.browser.tests.support import *
from zope.app.testing.functional import BrowserTestCase
class IRadioTest(Interface):
Modified: Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_functional_textareawidget.py
===================================================================
--- Sandbox/faassen/zope.formlibwidget/src/zope/app/form/browser/tests/test_functional_textareawidget.py 2009-12-30 16:38:32 UTC (rev 107363)
+++ Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_functional_textareawidget.py 2009-12-30 17:32:58 UTC (rev 107364)
@@ -24,8 +24,8 @@
from zope.schema import Text
from zope.traversing.api import traverse
-from zope.app.form.testing import AppFormLayer
-from zope.app.form.browser.tests.support import *
+from zope.formlibwidget.testing import AppFormLayer
+from zope.formlibwidget.browser.tests.support import *
from zope.app.testing.functional import BrowserTestCase
class ITextTest(Interface):
Modified: Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_functional_textwidget.py
===================================================================
--- Sandbox/faassen/zope.formlibwidget/src/zope/app/form/browser/tests/test_functional_textwidget.py 2009-12-30 16:38:32 UTC (rev 107363)
+++ Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_functional_textwidget.py 2009-12-30 17:32:58 UTC (rev 107364)
@@ -24,8 +24,8 @@
from zope.schema import TextLine, Choice
from zope.traversing.api import traverse
-from zope.app.form.testing import AppFormLayer
-from zope.app.form.browser.tests.support import *
+from zope.formlibwidget.testing import AppFormLayer
+from zope.formlibwidget.browser.tests.support import *
from zope.app.testing.functional import BrowserTestCase
class ITextLineTest(Interface):
Modified: Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_intwidget.py
===================================================================
--- Sandbox/faassen/zope.formlibwidget/src/zope/app/form/browser/tests/test_intwidget.py 2009-12-30 16:38:32 UTC (rev 107363)
+++ Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_intwidget.py 2009-12-30 17:32:58 UTC (rev 107364)
@@ -16,12 +16,12 @@
$Id$
"""
import unittest
-from zope.testing import doctest
+import doctest
from unittest import main, makeSuite
-from zope.app.form.browser.tests.test_browserwidget import SimpleInputWidgetTest
-from zope.app.form.interfaces import IInputWidget
-from zope.app.form.browser import IntWidget
-from zope.app.form.interfaces import ConversionError, WidgetInputError
+from zope.formlibwidget.browser.tests.test_browserwidget import SimpleInputWidgetTest
+from zope.formlibwidget.interfaces import IInputWidget
+from zope.formlibwidget.browser import IntWidget
+from zope.formlibwidget.interfaces import ConversionError, WidgetInputError
from zope.interface.verify import verifyClass
from zope.schema import Int
Modified: Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_itemswidget.py
===================================================================
--- Sandbox/faassen/zope.formlibwidget/src/zope/app/form/browser/tests/test_itemswidget.py 2009-12-30 16:38:32 UTC (rev 107363)
+++ Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_itemswidget.py 2009-12-30 17:32:58 UTC (rev 107364)
@@ -23,20 +23,20 @@
from zope.schema import Choice, List, Set, FrozenSet
from zope.schema.vocabulary import SimpleVocabulary, SimpleTerm
-import zope.app.form.browser.itemswidgets
-from zope.app.form.browser.itemswidgets import ItemsWidgetBase
-from zope.app.form.browser.itemswidgets import ItemDisplayWidget
-from zope.app.form.browser.itemswidgets import ItemsMultiDisplayWidget
-from zope.app.form.browser.itemswidgets import ListDisplayWidget
-from zope.app.form.browser.itemswidgets import SetDisplayWidget
-from zope.app.form.browser.itemswidgets import ItemsEditWidgetBase
-from zope.app.form.browser.itemswidgets import SelectWidget, DropdownWidget
-from zope.app.form.browser.itemswidgets import RadioWidget
-from zope.app.form.browser.itemswidgets import ItemsMultiEditWidgetBase
-from zope.app.form.browser.itemswidgets import MultiSelectWidget
-from zope.app.form.browser.itemswidgets import OrderedMultiSelectWidget
-from zope.app.form.browser.itemswidgets import MultiCheckBoxWidget
-from zope.app.form.browser.tests.support import VerifyResults
+import zope.formlibwidget.browser.itemswidgets
+from zope.formlibwidget.browser.itemswidgets import ItemsWidgetBase
+from zope.formlibwidget.browser.itemswidgets import ItemDisplayWidget
+from zope.formlibwidget.browser.itemswidgets import ItemsMultiDisplayWidget
+from zope.formlibwidget.browser.itemswidgets import ListDisplayWidget
+from zope.formlibwidget.browser.itemswidgets import SetDisplayWidget
+from zope.formlibwidget.browser.itemswidgets import ItemsEditWidgetBase
+from zope.formlibwidget.browser.itemswidgets import SelectWidget, DropdownWidget
+from zope.formlibwidget.browser.itemswidgets import RadioWidget
+from zope.formlibwidget.browser.itemswidgets import ItemsMultiEditWidgetBase
+from zope.formlibwidget.browser.itemswidgets import MultiSelectWidget
+from zope.formlibwidget.browser.itemswidgets import OrderedMultiSelectWidget
+from zope.formlibwidget.browser.itemswidgets import MultiCheckBoxWidget
+from zope.formlibwidget.browser.tests.support import VerifyResults
vocab = SimpleVocabulary(
[SimpleTerm(value, token, title) for value, token, title in (
@@ -331,14 +331,14 @@
u'<option value="token3">Three</option>'])
try:
# test BBB starting with 3.6.0
- zope.app.form.browser.itemswidgets.EXPLICIT_EMPTY_SELECTION = False
+ zope.formlibwidget.browser.itemswidgets.EXPLICIT_EMPTY_SELECTION = False
self.assertEqual(
widget.renderItems(widget._toFormValue(widget.context.missing_value)),
[u'<option value="token1">One</option>',
u'<option value="token2">Two</option>',
u'<option value="token3">Three</option>'])
finally:
- zope.app.form.browser.itemswidgets.EXPLICIT_EMPTY_SELECTION = True
+ zope.formlibwidget.browser.itemswidgets.EXPLICIT_EMPTY_SELECTION = True
class RadioWidgetTest(ItemsEditWidgetBaseTest):
Modified: Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_multicheckboxwidget.py
===================================================================
--- Sandbox/faassen/zope.formlibwidget/src/zope/app/form/browser/tests/test_multicheckboxwidget.py 2009-12-30 16:38:32 UTC (rev 107363)
+++ Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_multicheckboxwidget.py 2009-12-30 17:32:58 UTC (rev 107364)
@@ -16,14 +16,14 @@
$Id$
"""
import unittest
-from zope.testing import doctest
+import doctest
from zope.interface import Interface, implements
from zope.publisher.browser import TestRequest
from zope.schema import Choice, List
-from zope.app.form.interfaces import IInputWidget
-from zope.app.form.browser import MultiCheckBoxWidget
-from zope.app.form.browser.tests.test_browserwidget import SimpleInputWidgetTest
+from zope.formlibwidget.interfaces import IInputWidget
+from zope.formlibwidget.browser import MultiCheckBoxWidget
+from zope.formlibwidget.browser.tests.test_browserwidget import SimpleInputWidgetTest
from zope.interface.verify import verifyClass
class MultiCheckBoxWidgetTest(SimpleInputWidgetTest):
Modified: Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_objectwidget.py
===================================================================
--- Sandbox/faassen/zope.formlibwidget/src/zope/app/form/browser/tests/test_objectwidget.py 2009-12-30 16:38:32 UTC (rev 107363)
+++ Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_objectwidget.py 2009-12-30 17:32:58 UTC (rev 107364)
@@ -22,14 +22,14 @@
from zope.publisher.browser import TestRequest
from zope.schema import Object, TextLine
from zope.schema.interfaces import ITextLine
-from zope.testing import doctest
+import doctest
from zope.app.testing import ztapi
-from zope.app.form.interfaces import IInputWidget, MissingInputError
-from zope.app.form.browser import TextWidget, ObjectWidget
-from zope.app.form.browser.tests.test_browserwidget import BrowserWidgetTest
-from zope.app.form.browser.interfaces import IWidgetInputErrorView
+from zope.formlibwidget.interfaces import IInputWidget, MissingInputError
+from zope.formlibwidget.browser import TextWidget, ObjectWidget
+from zope.formlibwidget.browser.tests.test_browserwidget import BrowserWidgetTest
+from zope.formlibwidget.browser.interfaces import IWidgetInputErrorView
class ITestContact(Interface):
name = TextLine()
@@ -105,9 +105,9 @@
self.assertRaises(MissingInputError, widget.getInputValue)
error_html = widget.error()
if sys.version_info < (2, 5):
- self.failUnless("email: <zope.app.form.interfaces.Mis"
+ self.failUnless("email: <zope.formlibwidget.interfaces.Mis"
in error_html)
- self.failUnless("name: <zope.app.form.interfaces.Miss"
+ self.failUnless("name: <zope.formlibwidget.interfaces.Miss"
in error_html)
else:
self.failUnless("email: MissingInputError(u'field.foo.email', u'', None)"
Modified: Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_passwordwidget.py
===================================================================
--- Sandbox/faassen/zope.formlibwidget/src/zope/app/form/browser/tests/test_passwordwidget.py 2009-12-30 16:38:32 UTC (rev 107363)
+++ Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_passwordwidget.py 2009-12-30 17:32:58 UTC (rev 107364)
@@ -16,10 +16,10 @@
$Id$
"""
import unittest
-from zope.testing import doctest
-from zope.app.form.interfaces import IInputWidget
-from zope.app.form.browser import PasswordWidget
-from zope.app.form.browser.tests.test_browserwidget import SimpleInputWidgetTest
+import doctest
+from zope.formlibwidget.interfaces import IInputWidget
+from zope.formlibwidget.browser import PasswordWidget
+from zope.formlibwidget.browser.tests.test_browserwidget import SimpleInputWidgetTest
from zope.interface.verify import verifyClass
class PasswordWidgetTest(SimpleInputWidgetTest):
Modified: Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_radiowidget.py
===================================================================
--- Sandbox/faassen/zope.formlibwidget/src/zope/app/form/browser/tests/test_radiowidget.py 2009-12-30 16:38:32 UTC (rev 107363)
+++ Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_radiowidget.py 2009-12-30 17:32:58 UTC (rev 107364)
@@ -16,15 +16,15 @@
$Id$
"""
import unittest
-from zope.testing import doctest
+import doctest
from zope.interface import Interface, implements
from zope.interface.verify import verifyClass
from zope.publisher.browser import TestRequest
from zope.schema import Choice
-from zope.app.form.interfaces import IInputWidget
-from zope.app.form.browser import RadioWidget
-from zope.app.form.browser.tests.test_browserwidget import SimpleInputWidgetTest
+from zope.formlibwidget.interfaces import IInputWidget
+from zope.formlibwidget.browser import RadioWidget
+from zope.formlibwidget.browser.tests.test_browserwidget import SimpleInputWidgetTest
class RadioWidgetTest(SimpleInputWidgetTest):
"""Documents and tests the radio widget.
Modified: Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_registrations.py
===================================================================
--- Sandbox/faassen/zope.formlibwidget/src/zope/app/form/browser/tests/test_registrations.py 2009-12-30 16:38:32 UTC (rev 107363)
+++ Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_registrations.py 2009-12-30 17:32:58 UTC (rev 107364)
@@ -21,15 +21,15 @@
from zope.configuration import xmlconfig
from zope.interface import implements
from zope.publisher.browser import TestRequest
-from zope.testing.doctest import DocTestSuite
+from doctest import DocTestSuite
from zope.component import testing
# import all widgets (in this case, importing * is ok, since we
# absolutely know what we're importing)
-from zope.app.form.browser import *
+from zope.formlibwidget.browser import *
-from zope.app.form.interfaces import IDisplayWidget, IInputWidget
-import zope.app.form.browser
+from zope.formlibwidget.interfaces import IDisplayWidget, IInputWidget
+import zope.formlibwidget.browser
import zope.schema as fields
from zope.schema import interfaces
@@ -55,7 +55,7 @@
def setUp(test):
testing.setUp()
context = xmlconfig.file("tests/registerWidgets.zcml",
- zope.app.form.browser)
+ zope.formlibwidget.browser)
class Tests(object):
"""Documents and tests widgets registration for specific field types.
Modified: Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_selectwidget.py
===================================================================
--- Sandbox/faassen/zope.formlibwidget/src/zope/app/form/browser/tests/test_selectwidget.py 2009-12-30 16:38:32 UTC (rev 107363)
+++ Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_selectwidget.py 2009-12-30 17:32:58 UTC (rev 107364)
@@ -18,7 +18,7 @@
import unittest
from zope.schema import Choice, List
-from zope.app.form.browser import SelectWidget
+from zope.formlibwidget.browser import SelectWidget
from zope.publisher.browser import TestRequest
choice = Choice(
Modified: Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_sequencewidget.py
===================================================================
--- Sandbox/faassen/zope.formlibwidget/src/zope/app/form/browser/tests/test_sequencewidget.py 2009-12-30 16:38:32 UTC (rev 107363)
+++ Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_sequencewidget.py 2009-12-30 17:32:58 UTC (rev 107364)
@@ -20,22 +20,22 @@
from zope.schema import Tuple, List, TextLine
from zope.schema.interfaces import ITextLine
from zope.publisher.browser import TestRequest
-from zope.testing import doctest
+import doctest
from zope.app.testing import ztapi, setup
-from zope.app.form.browser import TextWidget, ObjectWidget, DisplayWidget
-from zope.app.form.browser import TupleSequenceWidget, ListSequenceWidget
-from zope.app.form.browser import SequenceDisplayWidget
-from zope.app.form.browser import SequenceWidget
-from zope.app.form.interfaces import IDisplayWidget
-from zope.app.form.interfaces import IInputWidget, MissingInputError
-from zope.app.form.interfaces import IWidgetInputError, WidgetInputError
-from zope.app.form.browser.interfaces import IWidgetInputErrorView
-from zope.app.form import CustomWidgetFactory
-from zope.app.form.browser.exception import WidgetInputErrorView
+from zope.formlibwidget.browser import TextWidget, ObjectWidget, DisplayWidget
+from zope.formlibwidget.browser import TupleSequenceWidget, ListSequenceWidget
+from zope.formlibwidget.browser import SequenceDisplayWidget
+from zope.formlibwidget.browser import SequenceWidget
+from zope.formlibwidget.interfaces import IDisplayWidget
+from zope.formlibwidget.interfaces import IInputWidget, MissingInputError
+from zope.formlibwidget.interfaces import IWidgetInputError, WidgetInputError
+from zope.formlibwidget.browser.interfaces import IWidgetInputErrorView
+from zope.formlibwidget import CustomWidgetFactory
+from zope.formlibwidget.browser.exception import WidgetInputErrorView
-from zope.app.form.browser.tests.support import VerifyResults
-from zope.app.form.browser.tests.test_browserwidget import BrowserWidgetTest
+from zope.formlibwidget.browser.tests.support import VerifyResults
+from zope.formlibwidget.browser.tests.test_browserwidget import BrowserWidgetTest
class SequenceWidgetTestHelper(object):
Modified: Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_setprefix.py
===================================================================
--- Sandbox/faassen/zope.formlibwidget/src/zope/app/form/browser/tests/test_setprefix.py 2009-12-30 16:38:32 UTC (rev 107363)
+++ Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_setprefix.py 2009-12-30 17:32:58 UTC (rev 107364)
@@ -17,8 +17,8 @@
"""
import unittest
-from zope.app.form.browser import TextWidget
-from zope.app.form.browser.tests import support
+from zope.formlibwidget.browser import TextWidget
+from zope.formlibwidget.browser.tests import support
from zope.publisher.browser import TestRequest
from zope.schema import Text
Modified: Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_source.py
===================================================================
--- Sandbox/faassen/zope.formlibwidget/src/zope/app/form/browser/tests/test_source.py 2009-12-30 16:38:32 UTC (rev 107363)
+++ Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_source.py 2009-12-30 17:32:58 UTC (rev 107364)
@@ -18,7 +18,7 @@
from zope.component import testing
def test_suite():
- from zope.testing import doctest
+ import doctest
return doctest.DocFileSuite(
'../source.txt',
setUp=testing.setUp, tearDown=testing.tearDown)
Modified: Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_textareawidget.py
===================================================================
--- Sandbox/faassen/zope.formlibwidget/src/zope/app/form/browser/tests/test_textareawidget.py 2009-12-30 16:38:32 UTC (rev 107363)
+++ Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_textareawidget.py 2009-12-30 17:32:58 UTC (rev 107364)
@@ -16,10 +16,10 @@
$Id$
"""
import unittest
-from zope.testing import doctest
-from zope.app.form.interfaces import IInputWidget
-from zope.app.form.browser import TextAreaWidget
-from zope.app.form.browser.tests.test_browserwidget import SimpleInputWidgetTest
+import doctest
+from zope.formlibwidget.interfaces import IInputWidget
+from zope.formlibwidget.browser import TextAreaWidget
+from zope.formlibwidget.browser.tests.test_browserwidget import SimpleInputWidgetTest
from zope.interface.verify import verifyClass
class TextAreaWidgetTest(SimpleInputWidgetTest):
Modified: Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_textwidget.py
===================================================================
--- Sandbox/faassen/zope.formlibwidget/src/zope/app/form/browser/tests/test_textwidget.py 2009-12-30 16:38:32 UTC (rev 107363)
+++ Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_textwidget.py 2009-12-30 17:32:58 UTC (rev 107364)
@@ -17,32 +17,32 @@
"""
import datetime
import unittest
-from zope.testing import doctest
+import doctest
from zope.component.testing import setUp, tearDown
from zope.interface.verify import verifyClass
from zope.schema import TextLine
from zope.publisher.browser import TestRequest
from zope.schema import Password
-from zope.app.form.interfaces import IInputWidget
+from zope.formlibwidget.interfaces import IInputWidget
-from zope.app.form.browser import TextWidget
+from zope.formlibwidget.browser import TextWidget
-from zope.app.form.browser import TextAreaWidget
-from zope.app.form.browser import BytesAreaWidget
-from zope.app.form.browser import PasswordWidget
-from zope.app.form.browser import FileWidget
-from zope.app.form.browser import IntWidget
-from zope.app.form.browser import FloatWidget
-from zope.app.form.browser import BytesWidget
-from zope.app.form.browser import ASCIIWidget
+from zope.formlibwidget.browser import TextAreaWidget
+from zope.formlibwidget.browser import BytesAreaWidget
+from zope.formlibwidget.browser import PasswordWidget
+from zope.formlibwidget.browser import FileWidget
+from zope.formlibwidget.browser import IntWidget
+from zope.formlibwidget.browser import FloatWidget
+from zope.formlibwidget.browser import BytesWidget
+from zope.formlibwidget.browser import ASCIIWidget
-from zope.app.form.browser import DateDisplayWidget
-from zope.app.form.browser import DatetimeDisplayWidget
-from zope.app.form.browser import URIDisplayWidget
+from zope.formlibwidget.browser import DateDisplayWidget
+from zope.formlibwidget.browser import DatetimeDisplayWidget
+from zope.formlibwidget.browser import URIDisplayWidget
-from zope.app.form.browser.tests.test_browserwidget import BrowserWidgetTest
-from zope.app.form.browser.tests.test_browserwidget \
+from zope.formlibwidget.browser.tests.test_browserwidget import BrowserWidgetTest
+from zope.formlibwidget.browser.tests.test_browserwidget \
import SimpleInputWidgetTest
class TextWidgetTest(SimpleInputWidgetTest):
Modified: Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_widgetdirective.py
===================================================================
--- Sandbox/faassen/zope.formlibwidget/src/zope/app/form/browser/tests/test_widgetdirective.py 2009-12-30 16:38:32 UTC (rev 107363)
+++ Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_widgetdirective.py 2009-12-30 17:32:58 UTC (rev 107364)
@@ -24,9 +24,9 @@
import zope.schema
from zope.browser.interfaces import IAdding
-import zope.app.form.browser.interfaces
-import zope.app.form.interfaces
-from zope.app.form.tests import utils
+import zope.formlibwidget.browser.interfaces
+import zope.formlibwidget.interfaces
+from zope.formlibwidget.tests import utils
import zope.component.testing
__docformat__ = "reStructuredText"
@@ -66,7 +66,7 @@
def setUp(self):
super(WidgetDirectiveTestCase, self).setUp()
zope.configuration.xmlconfig.file("widgetDirectives.zcml",
- zope.app.form.browser.tests)
+ zope.formlibwidget.browser.tests)
def get_widget(self, name, context):
request = zope.publisher.browser.TestRequest()
@@ -75,17 +75,17 @@
def test_addform_widget_without_class(self):
w = self.get_widget("add.html", Adding())
- self.assert_(zope.app.form.interfaces.IInputWidget.providedBy(w))
+ self.assert_(zope.formlibwidget.interfaces.IInputWidget.providedBy(w))
self.assertEqual(w.extraAttr, "42")
def test_editform_widget_without_class(self):
w = self.get_widget("edit.html", Content())
- self.assert_(zope.app.form.interfaces.IInputWidget.providedBy(w))
+ self.assert_(zope.formlibwidget.interfaces.IInputWidget.providedBy(w))
self.assertEqual(w.extraAttr, "84")
def test_subeditform_widget_without_class(self):
w = self.get_widget("subedit.html", Content())
- self.assert_(zope.app.form.interfaces.IInputWidget.providedBy(w))
+ self.assert_(zope.formlibwidget.interfaces.IInputWidget.providedBy(w))
self.assertEqual(w.extraAttr, "168")
Modified: Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_widgetdocs.py
===================================================================
--- Sandbox/faassen/zope.formlibwidget/src/zope/app/form/browser/tests/test_widgetdocs.py 2009-12-30 16:38:32 UTC (rev 107363)
+++ Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/test_widgetdocs.py 2009-12-30 17:32:58 UTC (rev 107364)
@@ -16,11 +16,11 @@
$Id$
"""
import unittest
-from zope.testing.doctest import DocTestSuite
+from doctest import DocTestSuite
def test_suite():
suite = unittest.TestSuite()
- suite.addTest(DocTestSuite("zope.app.form.browser.textwidgets"))
+ suite.addTest(DocTestSuite("zope.formlibwidget.browser.textwidgets"))
return suite
if __name__ == '__main__':
Modified: Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/widgetDirectives.zcml
===================================================================
--- Sandbox/faassen/zope.formlibwidget/src/zope/app/form/browser/tests/widgetDirectives.zcml 2009-12-30 16:38:32 UTC (rev 107363)
+++ Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/tests/widgetDirectives.zcml 2009-12-30 17:32:58 UTC (rev 107364)
@@ -3,13 +3,13 @@
i18n_domain="zope">
<include package="zope.component" file="meta.zcml" />
- <include package="zope.app.form.browser" file="meta.zcml" />
+ <include package="zope.formlibwidget.browser" file="meta.zcml" />
<zope:view
type="zope.publisher.interfaces.browser.IBrowserRequest"
for="zope.schema.interfaces.ITextLine"
- provides="zope.app.form.interfaces.IInputWidget"
- factory="zope.app.form.browser.TextWidget"
+ provides="zope.formlibwidget.interfaces.IInputWidget"
+ factory="zope.formlibwidget.browser.TextWidget"
permission="zope.Public"
/>
Modified: Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/textwidgets.py
===================================================================
--- Sandbox/faassen/zope.formlibwidget/src/zope/app/form/browser/textwidgets.py 2009-12-30 16:38:32 UTC (rev 107363)
+++ Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/textwidgets.py 2009-12-30 17:32:58 UTC (rev 107364)
@@ -24,11 +24,11 @@
from zope.datetime import DateTimeError
from zope.i18n.format import DateTimeParseError
-from zope.app.form.interfaces import IInputWidget, ConversionError
-from zope.app.form.browser.i18n import _
-from zope.app.form.browser.interfaces import ITextBrowserWidget
-from zope.app.form.browser.widget import SimpleInputWidget, renderElement
-from zope.app.form.browser.widget import DisplayWidget
+from zope.formlibwidget.interfaces import IInputWidget, ConversionError
+from zope.formlibwidget.browser.i18n import _
+from zope.formlibwidget.browser.interfaces import ITextBrowserWidget
+from zope.formlibwidget.browser.widget import SimpleInputWidget, renderElement
+from zope.formlibwidget.browser.widget import DisplayWidget
def escape(str):
@@ -297,7 +297,7 @@
>>> from zope.schema import Text
>>> field = Text(__name__='description', title=u'Description')
- >>> from zope.app.form.interfaces import ConversionError
+ >>> from zope.formlibwidget.interfaces import ConversionError
>>> class TestTextAreaWidget(TextAreaWidget):
... def _toFieldValue(self, input):
... if 'foo' in input:
Modified: Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/widget.py
===================================================================
--- Sandbox/faassen/zope.formlibwidget/src/zope/app/form/browser/widget.py 2009-12-30 16:38:32 UTC (rev 107363)
+++ Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/widget.py 2009-12-30 17:32:58 UTC (rev 107364)
@@ -24,13 +24,13 @@
from zope.schema.interfaces import ValidationError
from zope.publisher.browser import BrowserView
-from zope.app.form import Widget, InputWidget
-from zope.app.form.interfaces import ConversionError
-from zope.app.form.interfaces import InputErrors
-from zope.app.form.interfaces import WidgetInputError, MissingInputError
-from zope.app.form.browser.interfaces import IBrowserWidget
-from zope.app.form.browser.interfaces import ISimpleInputWidget
-from zope.app.form.browser.interfaces import IWidgetInputErrorView
+from zope.formlibwidget import Widget, InputWidget
+from zope.formlibwidget.interfaces import ConversionError
+from zope.formlibwidget.interfaces import InputErrors
+from zope.formlibwidget.interfaces import WidgetInputError, MissingInputError
+from zope.formlibwidget.browser.interfaces import IBrowserWidget
+from zope.formlibwidget.browser.interfaces import ISimpleInputWidget
+from zope.formlibwidget.browser.interfaces import IWidgetInputErrorView
import warnings
@@ -76,7 +76,7 @@
view that is registered as providing `IWidgetInputErrorView`. To
illustrate, we can create and register a simple error display view:
- >>> from zope.app.form.interfaces import IWidgetInputError
+ >>> from zope.formlibwidget.interfaces import IWidgetInputError
>>> class SnippetErrorView:
... implements(IWidgetInputErrorView)
... def __init__(self, context, request):
@@ -250,7 +250,7 @@
>>> from zope.schema import Float
>>> field = Float(__name__='price', title=u'Price')
- >>> from zope.app.form.interfaces import ConversionError
+ >>> from zope.formlibwidget.interfaces import ConversionError
>>> class FloatWidget(SimpleInputWidget):
... def _toFieldValue(self, input):
... try:
Modified: Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/widgets.txt
===================================================================
--- Sandbox/faassen/zope.formlibwidget/src/zope/app/form/browser/widgets.txt 2009-12-30 16:38:32 UTC (rev 107363)
+++ Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/browser/widgets.txt 2009-12-30 17:32:58 UTC (rev 107364)
@@ -75,10 +75,10 @@
we need to pass in additional information. This is given in the
``browser.py`` file::
- from zope.app.form.browser.editview import EditView
- from zope.app.form.browser.add import AddView
- from zope.app.form import CustomWidgetFactory
- from zope.app.form.browser import SequenceWidget, ObjectWidget
+ from zope.formlibwidget.browser.editview import EditView
+ from zope.formlibwidget.browser.add import AddView
+ from zope.formlibwidget import CustomWidgetFactory
+ from zope.formlibwidget.browser import SequenceWidget, ObjectWidget
from interfaces import IPoll
from poll import Poll, PollOption
Modified: Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/ftesting.zcml
===================================================================
--- Sandbox/faassen/zope.formlibwidget/src/zope/app/form/ftesting.zcml 2009-12-30 16:38:32 UTC (rev 107363)
+++ Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/ftesting.zcml 2009-12-30 17:32:58 UTC (rev 107364)
@@ -2,7 +2,7 @@
xmlns="http://namespaces.zope.org/zope"
xmlns:browser="http://namespaces.zope.org/browser"
i18n_domain="zope"
- package="zope.app.form"
+ package="zope.formlibwidget"
>
<include package="zope.browserpage" file="meta.zcml" />
@@ -29,7 +29,7 @@
<browser:page
name="standard_macros"
for="*"
- class="zope.app.form.browser.macros.FormMacros"
+ class="zope.formlibwidget.browser.macros.FormMacros"
allowed_interface="zope.interface.common.mapping.IItemMapping"
permission="zope.Public" />
@@ -39,8 +39,8 @@
permission="zope.View"
template="tests/test_macros.pt" />
- <include package="zope.app.form.browser" file="meta.zcml" />
- <include package="zope.app.form.browser" />
- <include package="zope.app.form.browser.tests" file="i18n.zcml" />
+ <include package="zope.formlibwidget.browser" file="meta.zcml" />
+ <include package="zope.formlibwidget.browser" />
+ <include package="zope.formlibwidget.browser.tests" file="i18n.zcml" />
</configure>
Modified: Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/testing.py
===================================================================
--- Sandbox/faassen/zope.formlibwidget/src/zope/app/form/testing.py 2009-12-30 16:38:32 UTC (rev 107363)
+++ Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/testing.py 2009-12-30 17:32:58 UTC (rev 107364)
@@ -11,7 +11,7 @@
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
-"""zope.app.form common test related classes/functions/objects.
+"""zope.formlibwidget common test related classes/functions/objects.
$Id$
"""
Modified: Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/tests/test_utility.py
===================================================================
--- Sandbox/faassen/zope.formlibwidget/src/zope/app/form/tests/test_utility.py 2009-12-30 16:38:32 UTC (rev 107363)
+++ Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/tests/test_utility.py 2009-12-30 17:32:58 UTC (rev 107364)
@@ -16,7 +16,7 @@
$Id$
"""
-from zope.testing import doctest
+import doctest
import zope.security.checker
from zope.interface import Interface, implements
from zope.component import testing
@@ -28,15 +28,15 @@
from zope.app.testing import ztapi
-from zope.app.form import Widget
-from zope.app.form.interfaces import IWidget, IInputWidget, IDisplayWidget
-from zope.app.form.interfaces import ConversionError, InputErrors, WidgetsError
-from zope.app.form.interfaces import IWidgetFactory
-from zope.app.form.utility import no_value, setUpWidget, setUpWidgets
-from zope.app.form.utility import setUpEditWidgets, setUpDisplayWidgets
-from zope.app.form.utility import getWidgetsData, viewHasInput
-from zope.app.form.utility import applyWidgetsChanges
-from zope.app.form.tests import utils
+from zope.formlibwidget import Widget
+from zope.formlibwidget.interfaces import IWidget, IInputWidget, IDisplayWidget
+from zope.formlibwidget.interfaces import ConversionError, InputErrors, WidgetsError
+from zope.formlibwidget.interfaces import IWidgetFactory
+from zope.formlibwidget.utility import no_value, setUpWidget, setUpWidgets
+from zope.formlibwidget.utility import setUpEditWidgets, setUpDisplayWidgets
+from zope.formlibwidget.utility import getWidgetsData, viewHasInput
+from zope.formlibwidget.utility import applyWidgetsChanges
+from zope.formlibwidget.tests import utils
request = TestRequest()
@@ -524,9 +524,9 @@
... print "ignoreStickyValues: %s" % ignoreStickyValues
... print "context: %s" % context
... print '---'
- >>> import zope.app.form.utility
- >>> setUpWidgetsSave = zope.app.form.utility.setUpWidget
- >>> zope.app.form.utility.setUpWidget = setUpWidget
+ >>> import zope.formlibwidget.utility
+ >>> setUpWidgetsSave = zope.formlibwidget.utility.setUpWidget
+ >>> zope.formlibwidget.utility.setUpWidget = setUpWidget
When we call setUpWidgets, we should see that setUpWidget is called
for each field in the specified schema:
@@ -537,7 +537,7 @@
... context="Alt Context")
view: <class 'zope.publisher.browser.BrowserView'>
name: foo
- field: <class 'zope.app.form.tests.test_utility.Foo'>
+ field: <class 'zope.formlibwidget.tests.test_utility.Foo'>
viewType: <class 'zope.interface.interface.InterfaceClass'>
value: not specified
prefix prefix
@@ -546,14 +546,14 @@
---
view: <class 'zope.publisher.browser.BrowserView'>
name: bar
- field: <class 'zope.app.form.tests.test_utility.Bar'>
+ field: <class 'zope.formlibwidget.tests.test_utility.Bar'>
viewType: <class 'zope.interface.interface.InterfaceClass'>
value: Bar
prefix prefix
ignoreStickyValues: True
context: Alt Context
---
- >>> zope.app.form.utility.setUpWidget = setUpWidgetsSave
+ >>> zope.formlibwidget.utility.setUpWidget = setUpWidgetsSave
>>> tearDown()
"""
Modified: Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/tests/test_widget.py
===================================================================
--- Sandbox/faassen/zope.formlibwidget/src/zope/app/form/tests/test_widget.py 2009-12-30 16:38:32 UTC (rev 107363)
+++ Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/tests/test_widget.py 2009-12-30 17:32:58 UTC (rev 107364)
@@ -19,9 +19,9 @@
from zope.component.testing import setUp, tearDown
from zope.publisher.browser import TestRequest
-from zope.testing.doctest import DocTestSuite
+from doctest import DocTestSuite
-from zope.app.form import Widget
+from zope.formlibwidget import Widget
class TestContext(object):
@@ -41,7 +41,7 @@
Widget implements IWidget:
>>> from zope.interface.verify import verifyClass
- >>> from zope.app.form.interfaces import IWidget
+ >>> from zope.formlibwidget.interfaces import IWidget
>>> verifyClass(IWidget, Widget)
True
>>> widget = Widget(context, request)
@@ -105,8 +105,8 @@
To test the default methods, we must create a basic input widget
that provides a getInputValue method:
- >>> from zope.app.form import InputWidget
- >>> from zope.app.form.interfaces import WidgetInputError
+ >>> from zope.formlibwidget import InputWidget
+ >>> from zope.formlibwidget.interfaces import WidgetInputError
>>> class TestInputWidget(InputWidget):
... def getInputValue(self):
... if self.context.required:
@@ -162,7 +162,7 @@
Test regular widget:
- >>> from zope.app.form import CustomWidgetFactory
+ >>> from zope.formlibwidget import CustomWidgetFactory
>>> factory = CustomWidgetFactory(FooWidget, bar='baz')
>>> widget = factory(context, request)
>>> isinstance(widget, FooWidget)
@@ -173,7 +173,7 @@
Test sequence widget:
>>> from zope.schema import TextLine, List
- >>> from zope.app.form.browser import ListSequenceWidget
+ >>> from zope.formlibwidget.browser import ListSequenceWidget
>>> value_type = TextLine(__name__=u'bar')
>>> field = List( __name__=u'foo', value_type=value_type )
@@ -197,7 +197,7 @@
Test vocabulary widget:
>>> from zope.schema import Choice
- >>> from zope.app.form.browser import RadioWidget
+ >>> from zope.formlibwidget.browser import RadioWidget
>>> field = Choice( __name__=u'foo', values=['1', '2', '3'] )
>>> bound = field.bind(context)
Modified: Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/utility.py
===================================================================
--- Sandbox/faassen/zope.formlibwidget/src/zope/app/form/utility.py 2009-12-30 16:38:32 UTC (rev 107363)
+++ Sandbox/faassen/zope.formlibwidget/src/zope/formlibwidget/utility.py 2009-12-30 17:32:58 UTC (rev 107364)
@@ -41,11 +41,11 @@
from zope.interface.interfaces import IMethod
from zope.security.interfaces import ForbiddenAttribute, Unauthorized
from zope.schema import getFieldsInOrder
-from zope.app.form.interfaces import IWidget
-from zope.app.form.interfaces import WidgetsError, MissingInputError
-from zope.app.form.interfaces import InputErrors
-from zope.app.form.interfaces import IInputWidget, IDisplayWidget
-from zope.app.form.interfaces import IWidgetFactory
+from zope.formlibwidget.interfaces import IWidget
+from zope.formlibwidget.interfaces import WidgetsError, MissingInputError
+from zope.formlibwidget.interfaces import InputErrors
+from zope.formlibwidget.interfaces import IInputWidget, IDisplayWidget
+from zope.formlibwidget.interfaces import IWidgetFactory
# A marker that indicates 'no value' for any of the utility functions that
# accept a 'value' argument.
More information about the checkins
mailing list