[Checkins] SVN: zope.app.form/branches/faassen-zaf/ * use faassen-zaf branch of zope.formlib
Martijn Faassen
faassen at startifact.com
Wed Dec 30 13:36:02 EST 2009
Log message for revision 107371:
* use faassen-zaf branch of zope.formlib
* move zope.app.form.interfaces to zope.formlib.interfaces
and import directly from there.
Changed:
U zope.app.form/branches/faassen-zaf/buildout.cfg
U zope.app.form/branches/faassen-zaf/setup.py
U zope.app.form/branches/faassen-zaf/src/zope/app/form/__init__.py
U zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/README.txt
U zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/add.py
U zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/boolwidgets.py
U zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/configure.zcml
U zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/editview.py
U zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/exception.py
U zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/form.txt
U zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/formview.py
U zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/interfaces.py
U zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/itemswidgets.py
U zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/metaconfigure.py
U zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/objectwidget.py
U zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/objectwidget.txt
U zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/sequencewidget.py
U zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/source.py
U zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/source.txt
U zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/tests/test_browserwidget.py
U zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/tests/test_checkboxwidget.py
U zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/tests/test_choicecollections.py
U zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/tests/test_choicewidget.py
U zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/tests/test_datetimewidget.py
U zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/tests/test_datewidget.py
U zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/tests/test_decimalwidget.py
U zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/tests/test_directives.py
U zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/tests/test_displaywidget.py
U zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/tests/test_editview.py
U zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/tests/test_filewidget.py
U zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/tests/test_floatwidget.py
U zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/tests/test_form.py
U zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/tests/test_functional_filewidget.py
U zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/tests/test_intwidget.py
U zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/tests/test_multicheckboxwidget.py
U zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/tests/test_objectwidget.py
U zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/tests/test_passwordwidget.py
U zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/tests/test_radiowidget.py
U zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/tests/test_registrations.py
U zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/tests/test_sequencewidget.py
U zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/tests/test_textareawidget.py
U zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/tests/test_textwidget.py
U zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/tests/test_widgetdirective.py
U zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/tests/widgetDirectives.zcml
U zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/textwidgets.py
U zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/widget.py
U zope.app.form/branches/faassen-zaf/src/zope/app/form/interfaces.py
U zope.app.form/branches/faassen-zaf/src/zope/app/form/tests/test_utility.py
U zope.app.form/branches/faassen-zaf/src/zope/app/form/tests/test_widget.py
U zope.app.form/branches/faassen-zaf/src/zope/app/form/utility.py
-=-
Modified: zope.app.form/branches/faassen-zaf/buildout.cfg
===================================================================
--- zope.app.form/branches/faassen-zaf/buildout.cfg 2009-12-30 18:13:11 UTC (rev 107370)
+++ zope.app.form/branches/faassen-zaf/buildout.cfg 2009-12-30 18:36:02 UTC (rev 107371)
@@ -1,5 +1,5 @@
[buildout]
-develop = .
+develop = . ../zope.formlib
parts = test
[test]
Modified: zope.app.form/branches/faassen-zaf/setup.py
===================================================================
--- zope.app.form/branches/faassen-zaf/setup.py 2009-12-30 18:13:11 UTC (rev 107370)
+++ zope.app.form/branches/faassen-zaf/setup.py 2009-12-30 18:36:02 UTC (rev 107371)
@@ -78,6 +78,7 @@
install_requires=[
"setuptools",
"transaction",
+ "zope.formlib",
"zope.browser>=1.1",
"zope.browserpage>=3.10.1",
"zope.browsermenu",
Modified: zope.app.form/branches/faassen-zaf/src/zope/app/form/__init__.py
===================================================================
--- zope.app.form/branches/faassen-zaf/src/zope/app/form/__init__.py 2009-12-30 18:13:11 UTC (rev 107370)
+++ zope.app.form/branches/faassen-zaf/src/zope/app/form/__init__.py 2009-12-30 18:36:02 UTC (rev 107371)
@@ -17,7 +17,7 @@
"""
__docformat__ = 'restructuredtext'
-from zope.app.form.interfaces import IWidget, InputErrors, IWidgetFactory
+from zope.formlib.interfaces import IWidget, InputErrors, IWidgetFactory
from zope.interface import implements
from zope.i18n import translate
from zope.schema.interfaces import IChoice, ICollection
Modified: zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/README.txt
===================================================================
--- zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/README.txt 2009-12-30 18:13:11 UTC (rev 107370)
+++ zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/README.txt 2009-12-30 18:36:02 UTC (rev 107371)
@@ -13,7 +13,7 @@
<view
type="zope.publisher.interfaces.browser.IBrowserRequest"
for="zope.schema.interfaces.ITextLine"
- provides="zope.app.form.interfaces.IInputWidget"
+ provides="zope.formlib.interfaces.IInputWidget"
factory=".TextWidget"
permission="zope.Public"
/>
@@ -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.formlib.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.formlib.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.formlib.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.formlib.interfaces.IInputWidget"
factory=".BagWidget"
permission="zope.Public"
/>
Modified: zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/add.py
===================================================================
--- zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/add.py 2009-12-30 18:13:11 UTC (rev 107370)
+++ zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/add.py 2009-12-30 18:36:02 UTC (rev 107371)
@@ -30,7 +30,7 @@
from zope.lifecycleevent import Attributes
from zope.app.form.utility import setUpWidgets, getWidgetsData
-from zope.app.form.interfaces import IInputWidget, WidgetsError
+from zope.formlib.interfaces import IInputWidget, WidgetsError
from zope.app.form.browser.i18n import _
from zope.browserpage.simpleviewclass import SimpleViewClass
from zope.browserpage import ViewPageTemplateFile
Modified: zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/boolwidgets.py
===================================================================
--- zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/boolwidgets.py 2009-12-30 18:13:11 UTC (rev 107370)
+++ zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/boolwidgets.py 2009-12-30 18:36:02 UTC (rev 107371)
@@ -25,7 +25,7 @@
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.formlib.interfaces import IInputWidget
class CheckBoxWidget(SimpleInputWidget):
Modified: zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/configure.zcml
===================================================================
--- zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/configure.zcml 2009-12-30 18:13:11 UTC (rev 107370)
+++ zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/configure.zcml 2009-12-30 18:36:02 UTC (rev 107371)
@@ -29,7 +29,7 @@
<!-- Views for Widget Errors -->
<adapter
- for="zope.app.form.interfaces.IWidgetInputError
+ for="zope.formlib.interfaces.IWidgetInputError
zope.publisher.interfaces.browser.IBrowserRequest"
provides="zope.app.form.browser.interfaces.IWidgetInputErrorView"
factory="zope.app.form.browser.exception.WidgetInputErrorView"
@@ -41,7 +41,7 @@
<adapter
for="zope.schema.interfaces.IField
zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.app.form.interfaces.IDisplayWidget"
+ provides="zope.formlib.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.formlib.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.formlib.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.formlib.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.formlib.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.formlib.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.formlib.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.formlib.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.formlib.interfaces.IDisplayWidget"
factory=".DatetimeDisplayWidget"
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.formlib.interfaces.IDisplayWidget"
factory=".UnicodeDisplayWidget"
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.formlib.interfaces.IDisplayWidget"
factory=".UnicodeDisplayWidget"
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.formlib.interfaces.IDisplayWidget"
factory=".UnicodeDisplayWidget"
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.formlib.interfaces.IDisplayWidget"
factory=".ChoiceDisplayWidget"
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.formlib.interfaces.IDisplayWidget"
factory=".CollectionDisplayWidget"
permission="zope.Public"
/>
@@ -294,7 +294,7 @@
<adapter
for="zope.schema.interfaces.ISequence
zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.app.form.interfaces.IDisplayWidget"
+ provides="zope.formlib.interfaces.IDisplayWidget"
factory=".CollectionDisplayWidget"
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.formlib.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.formlib.interfaces.IDisplayWidget"
factory=".ChoiceCollectionDisplayWidget"
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.formlib.interfaces.IDisplayWidget"
factory=".ChoiceCollectionDisplayWidget"
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.formlib.interfaces.IDisplayWidget"
factory=".ChoiceCollectionDisplayWidget"
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.formlib.interfaces.IDisplayWidget"
factory=".ChoiceCollectionDisplayWidget"
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.formlib.interfaces.IDisplayWidget"
factory=".ItemDisplayWidget"
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.formlib.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.formlib.interfaces.IDisplayWidget"
factory=".SetDisplayWidget"
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.formlib.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.formlib.interfaces.IDisplayWidget"
factory=".source.SourceDisplayWidget"
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.formlib.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.formlib.interfaces.IDisplayWidget"
factory=".source.SourceSequenceDisplayWidget"
permission="zope.Public"
/>
Modified: zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/editview.py
===================================================================
--- zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/editview.py 2009-12-30 18:13:11 UTC (rev 107370)
+++ zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/editview.py 2009-12-30 18:36:02 UTC (rev 107371)
@@ -32,7 +32,7 @@
from zope.browserpage import ViewPageTemplateFile
from zope.browserpage.simpleviewclass import SimpleViewClass
-from zope.app.form.interfaces import WidgetsError
+from zope.formlib.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
Modified: zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/exception.py
===================================================================
--- zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/exception.py 2009-12-30 18:13:11 UTC (rev 107370)
+++ zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/exception.py 2009-12-30 18:36:02 UTC (rev 107371)
@@ -22,7 +22,7 @@
from zope.interface import implements
from zope.i18n import translate
-from zope.app.form.interfaces import IWidgetInputError
+from zope.formlib.interfaces import IWidgetInputError
from zope.app.form.browser.interfaces import IWidgetInputErrorView
class WidgetInputErrorView(object):
@@ -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.formlib.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.formlib.interfaces import ConversionError
>>> err = ConversionError('Could not convert to float.')
>>> view = WidgetInputErrorView(err, None)
>>> view.snippet()
Modified: zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/form.txt
===================================================================
--- zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/form.txt 2009-12-30 18:13:11 UTC (rev 107370)
+++ zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/form.txt 2009-12-30 18:36:02 UTC (rev 107371)
@@ -140,7 +140,7 @@
... <view
... type="zope.publisher.interfaces.browser.IBrowserRequest"
... for="zope.schema.interfaces.ITextLine"
- ... provides="zope.app.form.interfaces.IInputWidget"
+ ... provides="zope.formlib.interfaces.IInputWidget"
... factory="zope.app.form.browser.TextWidget"
... permission="zope.Public"
... />
Modified: zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/formview.py
===================================================================
--- zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/formview.py 2009-12-30 18:13:11 UTC (rev 107370)
+++ zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/formview.py 2009-12-30 18:36:02 UTC (rev 107371)
@@ -19,7 +19,7 @@
import transaction
-from zope.app.form.interfaces import WidgetsError, IInputWidget
+from zope.formlib.interfaces import WidgetsError, IInputWidget
from zope.app.form.utility import setUpWidgets, applyWidgetsChanges
from zope.app.form.browser.editview import EditView
Modified: zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/interfaces.py
===================================================================
--- zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/interfaces.py 2009-12-30 18:13:11 UTC (rev 107370)
+++ zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/interfaces.py 2009-12-30 18:36:02 UTC (rev 107371)
@@ -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.formlib.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: zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/itemswidgets.py
===================================================================
--- zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/itemswidgets.py 2009-12-30 18:13:11 UTC (rev 107370)
+++ zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/itemswidgets.py 2009-12-30 18:36:02 UTC (rev 107371)
@@ -25,8 +25,8 @@
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.formlib.interfaces import IInputWidget, IDisplayWidget
+from zope.formlib.interfaces import ConversionError
from zope.app.form.browser.i18n import _
from zope.browserpage import ViewPageTemplateFile
Modified: zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/metaconfigure.py
===================================================================
--- zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/metaconfigure.py 2009-12-30 18:13:11 UTC (rev 107370)
+++ zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/metaconfigure.py 2009-12-30 18:36:02 UTC (rev 107371)
@@ -32,8 +32,8 @@
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.formlib.interfaces import IInputWidget, IDisplayWidget
+from zope.formlib.interfaces import IWidgetFactory
from add import AddView, AddViewFactory
from editview import EditView, EditViewFactory
from formview import FormView
Modified: zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/objectwidget.py
===================================================================
--- zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/objectwidget.py 2009-12-30 18:13:11 UTC (rev 107370)
+++ zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/objectwidget.py 2009-12-30 18:36:02 UTC (rev 107371)
@@ -21,7 +21,7 @@
from zope.interface import implements
from zope.schema import getFieldNamesInOrder
-from zope.app.form.interfaces import IInputWidget
+from zope.formlib.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
Modified: zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/objectwidget.txt
===================================================================
--- zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/objectwidget.txt 2009-12-30 18:13:11 UTC (rev 107370)
+++ zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/objectwidget.txt 2009-12-30 18:36:02 UTC (rev 107371)
@@ -99,7 +99,7 @@
>>> 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.formlib.interfaces import IInputWidget
Register the TextLine widget used in the IPerson interface for the field 'name'.
Modified: zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/sequencewidget.py
===================================================================
--- zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/sequencewidget.py 2009-12-30 18:13:11 UTC (rev 107370)
+++ zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/sequencewidget.py 2009-12-30 18:36:02 UTC (rev 107371)
@@ -22,8 +22,8 @@
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.formlib.interfaces import IDisplayWidget, IInputWidget
+from zope.formlib.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
Modified: zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/source.py
===================================================================
--- zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/source.py 2009-12-30 18:13:11 UTC (rev 107370)
+++ zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/source.py 2009-12-30 18:36:02 UTC (rev 107371)
@@ -27,10 +27,10 @@
from zope.schema.interfaces import \
ISourceQueriables, ValidationError, IVocabularyTokenized, IIterableSource
-import zope.app.form.interfaces
+import zope.formlib.interfaces
import zope.app.form.browser.widget
import zope.app.form.browser.interfaces
-from zope.app.form.interfaces import WidgetInputError, MissingInputError
+from zope.formlib.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 \
@@ -41,7 +41,7 @@
class SourceDisplayWidget(zope.app.form.browser.widget.DisplayWidget):
- implements(zope.app.form.interfaces.IDisplayWidget)
+ implements(zope.formlib.interfaces.IDisplayWidget)
def __init__(self, field, source, request):
super(SourceDisplayWidget, self).__init__(field, request)
@@ -117,7 +117,7 @@
_error = None
- implements(zope.app.form.interfaces.IInputWidget)
+ implements(zope.formlib.interfaces.IInputWidget)
def __init__(self, field, source, request):
super(SourceInputWidget, self).__init__(field, request)
@@ -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.formlib.interfaces.MissingInputError(
field.__name__, self.label,
)
return field.missing_value
Modified: zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/source.txt
===================================================================
--- zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/source.txt 2009-12-30 18:13:11 UTC (rev 107370)
+++ zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/source.txt 2009-12-30 18:36:02 UTC (rev 107371)
@@ -265,7 +265,7 @@
>>> try:
... widget.getInputValue()
- ... except zope.app.form.interfaces.MissingInputError:
+ ... except zope.formlib.interfaces.MissingInputError:
... print 'no input'
no input
@@ -331,7 +331,7 @@
>>> try:
... widget.getInputValue()
- ... except zope.app.form.interfaces.MissingInputError:
+ ... except zope.formlib.interfaces.MissingInputError:
... print 'no input'
no input
@@ -382,7 +382,7 @@
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.formlib.interfaces import MissingInputError
>>> try:
... widget.getInputValue()
... except MissingInputError:
@@ -438,7 +438,7 @@
>>> try:
... widget.getInputValue()
- ... except zope.app.form.interfaces.MissingInputError:
+ ... except zope.formlib.interfaces.MissingInputError:
... print 'no input'
no input
Modified: zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/tests/test_browserwidget.py
===================================================================
--- zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/tests/test_browserwidget.py 2009-12-30 18:13:11 UTC (rev 107370)
+++ zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/tests/test_browserwidget.py 2009-12-30 18:36:02 UTC (rev 107371)
@@ -24,8 +24,8 @@
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.formlib.interfaces import ConversionError
+from zope.formlib.interfaces import WidgetInputError, MissingInputError
class BrowserWidgetTest(PlacelessSetup,
Modified: zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/tests/test_checkboxwidget.py
===================================================================
--- zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/tests/test_checkboxwidget.py 2009-12-30 18:13:11 UTC (rev 107370)
+++ zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/tests/test_checkboxwidget.py 2009-12-30 18:36:02 UTC (rev 107371)
@@ -17,13 +17,13 @@
"""
import unittest
from zope.testing import doctest
-from zope.app.form.interfaces import IInputWidget
+from zope.formlib.interfaces import IInputWidget
from zope.app.form.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.formlib.interfaces import MissingInputError
from zope.app.form.browser.tests.test_browserwidget import SimpleInputWidgetTest
Modified: zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/tests/test_choicecollections.py
===================================================================
--- zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/tests/test_choicecollections.py 2009-12-30 18:13:11 UTC (rev 107370)
+++ zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/tests/test_choicecollections.py 2009-12-30 18:36:02 UTC (rev 107371)
@@ -23,7 +23,7 @@
from zope.schema import Choice, List
from zope.app.testing import ztapi
-from zope.app.form.interfaces import IInputWidget, IDisplayWidget
+from zope.formlib.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
Modified: zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/tests/test_choicewidget.py
===================================================================
--- zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/tests/test_choicewidget.py 2009-12-30 18:13:11 UTC (rev 107370)
+++ zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/tests/test_choicewidget.py 2009-12-30 18:36:02 UTC (rev 107371)
@@ -23,7 +23,7 @@
from zope.schema import Choice
from zope.app.testing import ztapi
-from zope.app.form.interfaces import IInputWidget, IDisplayWidget
+from zope.formlib.interfaces import IInputWidget, IDisplayWidget
from zope.app.form.browser import ChoiceDisplayWidget, ChoiceInputWidget
from zope.app.form.browser import ItemDisplayWidget, DropdownWidget
Modified: zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/tests/test_datetimewidget.py
===================================================================
--- zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/tests/test_datetimewidget.py 2009-12-30 18:13:11 UTC (rev 107370)
+++ zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/tests/test_datetimewidget.py 2009-12-30 18:36:02 UTC (rev 107371)
@@ -24,10 +24,10 @@
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.formlib.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.formlib.interfaces import ConversionError, WidgetInputError
class DatetimeWidgetTest(SimpleInputWidgetTest):
Modified: zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/tests/test_datewidget.py
===================================================================
--- zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/tests/test_datewidget.py 2009-12-30 18:13:11 UTC (rev 107370)
+++ zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/tests/test_datewidget.py 2009-12-30 18:36:02 UTC (rev 107371)
@@ -23,10 +23,10 @@
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.formlib.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.formlib.interfaces import ConversionError, WidgetInputError
class DateWidgetTest(SimpleInputWidgetTest):
Modified: zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/tests/test_decimalwidget.py
===================================================================
--- zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/tests/test_decimalwidget.py 2009-12-30 18:13:11 UTC (rev 107370)
+++ zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/tests/test_decimalwidget.py 2009-12-30 18:36:02 UTC (rev 107371)
@@ -19,9 +19,9 @@
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.formlib.interfaces import IInputWidget
from zope.app.form.browser import DecimalWidget
-from zope.app.form.interfaces import ConversionError, WidgetInputError
+from zope.formlib.interfaces import ConversionError, WidgetInputError
from zope.interface.verify import verifyClass
from zope.schema import Decimal
Modified: zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/tests/test_directives.py
===================================================================
--- zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/tests/test_directives.py 2009-12-30 18:13:11 UTC (rev 107370)
+++ zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/tests/test_directives.py 2009-12-30 18:36:02 UTC (rev 107371)
@@ -88,7 +88,7 @@
<view
type="zope.publisher.interfaces.browser.IBrowserRequest"
for="zope.schema.interfaces.ITextLine"
- provides="zope.app.form.interfaces.IInputWidget"
+ provides="zope.formlib.interfaces.IInputWidget"
factory="zope.app.form.browser.TextWidget"
permission="zope.Public"
/>
@@ -114,7 +114,7 @@
<view
type="zope.publisher.interfaces.browser.IBrowserRequest"
for="zope.schema.interfaces.ITextLine"
- provides="zope.app.form.interfaces.IInputWidget"
+ provides="zope.formlib.interfaces.IInputWidget"
factory="zope.app.form.browser.TextWidget"
permission="zope.Public"
/>
@@ -141,7 +141,7 @@
<view
type="zope.publisher.interfaces.browser.IBrowserRequest"
for="zope.schema.interfaces.ITextLine"
- provides="zope.app.form.interfaces.IInputWidget"
+ provides="zope.formlib.interfaces.IInputWidget"
factory="zope.app.form.browser.TextWidget"
permission="zope.Public"
/>
@@ -169,7 +169,7 @@
<view
type="zope.publisher.interfaces.browser.IBrowserRequest"
for="zope.schema.interfaces.IField"
- provides="zope.app.form.interfaces.IDisplayWidget"
+ provides="zope.formlib.interfaces.IDisplayWidget"
factory="zope.app.form.browser.DisplayWidget"
permission="zope.Public"
/>
@@ -195,7 +195,7 @@
<view
type="zope.publisher.interfaces.browser.IBrowserRequest"
for="zope.schema.interfaces.ITextLine"
- provides="zope.app.form.interfaces.IInputWidget"
+ provides="zope.formlib.interfaces.IInputWidget"
factory="zope.app.form.browser.TextWidget"
permission="zope.Public"
/>
@@ -233,7 +233,7 @@
<view
type="zope.publisher.interfaces.browser.IBrowserRequest"
for="zope.schema.interfaces.ITextLine"
- provides="zope.app.form.interfaces.IInputWidget"
+ provides="zope.formlib.interfaces.IInputWidget"
factory="zope.app.form.browser.TextWidget"
permission="zope.Public"
/>
@@ -270,7 +270,7 @@
<view
type="zope.publisher.interfaces.browser.IBrowserRequest"
for="zope.schema.interfaces.IField"
- provides="zope.app.form.interfaces.IDisplayWidget"
+ provides="zope.formlib.interfaces.IDisplayWidget"
factory="zope.app.form.browser.DisplayWidget"
permission="zope.Public"
/>
Modified: zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/tests/test_displaywidget.py
===================================================================
--- zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/tests/test_displaywidget.py 2009-12-30 18:13:11 UTC (rev 107370)
+++ zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/tests/test_displaywidget.py 2009-12-30 18:36:02 UTC (rev 107371)
@@ -38,7 +38,7 @@
But unlike most other widgets in this package, the display widget is *not*
an `IInputWidget`.
- >>> from zope.app.form.interfaces import IInputWidget
+ >>> from zope.formlib.interfaces import IInputWidget
>>> try:
... verifyClass(IInputWidget, DisplayWidget)
... except DoesNotImplement:
Modified: zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/tests/test_editview.py
===================================================================
--- zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/tests/test_editview.py 2009-12-30 18:13:11 UTC (rev 107370)
+++ zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/tests/test_editview.py 2009-12-30 18:36:02 UTC (rev 107371)
@@ -30,7 +30,7 @@
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.formlib.interfaces import IInputWidget
from zope.app.form.tests import utils
class I(Interface):
Modified: zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/tests/test_filewidget.py
===================================================================
--- zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/tests/test_filewidget.py 2009-12-30 18:13:11 UTC (rev 107370)
+++ zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/tests/test_filewidget.py 2009-12-30 18:36:02 UTC (rev 107371)
@@ -19,7 +19,7 @@
from zope.testing import doctest
from StringIO import StringIO
-from zope.app.form.interfaces import IInputWidget
+from zope.formlib.interfaces import IInputWidget
from zope.app.form.browser import FileWidget
from zope.app.form.browser.tests.test_browserwidget import (
Modified: zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/tests/test_floatwidget.py
===================================================================
--- zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/tests/test_floatwidget.py 2009-12-30 18:13:11 UTC (rev 107370)
+++ zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/tests/test_floatwidget.py 2009-12-30 18:36:02 UTC (rev 107371)
@@ -18,9 +18,9 @@
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.formlib.interfaces import IInputWidget
from zope.app.form.browser import FloatWidget
-from zope.app.form.interfaces import ConversionError, WidgetInputError
+from zope.formlib.interfaces import ConversionError, WidgetInputError
from zope.interface.verify import verifyClass
from zope.schema import Float
Modified: zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/tests/test_form.py
===================================================================
--- zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/tests/test_form.py 2009-12-30 18:13:11 UTC (rev 107370)
+++ zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/tests/test_form.py 2009-12-30 18:36:02 UTC (rev 107371)
@@ -24,7 +24,7 @@
from zope.app.testing import ztapi
from zope.app.form.browser import TextWidget
-from zope.app.form.interfaces import IInputWidget
+from zope.formlib.interfaces import IInputWidget
def setUp(test):
testing.setUp()
Modified: zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/tests/test_functional_filewidget.py
===================================================================
--- zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/tests/test_functional_filewidget.py 2009-12-30 18:13:11 UTC (rev 107370)
+++ zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/tests/test_functional_filewidget.py 2009-12-30 18:36:02 UTC (rev 107371)
@@ -30,7 +30,7 @@
from zope.app.form.browser.textwidgets import FileWidget
from zope.app.form.browser.tests.support import *
from zope.app.testing.functional import BrowserTestCase
-from zope.app.form.interfaces import IInputWidget
+from zope.formlib.interfaces import IInputWidget
class IFileField(IField):
"""Field for representing a file that can be edited by FileWidget."""
Modified: zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/tests/test_intwidget.py
===================================================================
--- zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/tests/test_intwidget.py 2009-12-30 18:13:11 UTC (rev 107370)
+++ zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/tests/test_intwidget.py 2009-12-30 18:36:02 UTC (rev 107371)
@@ -19,9 +19,9 @@
from zope.testing 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.formlib.interfaces import IInputWidget
from zope.app.form.browser import IntWidget
-from zope.app.form.interfaces import ConversionError, WidgetInputError
+from zope.formlib.interfaces import ConversionError, WidgetInputError
from zope.interface.verify import verifyClass
from zope.schema import Int
Modified: zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/tests/test_multicheckboxwidget.py
===================================================================
--- zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/tests/test_multicheckboxwidget.py 2009-12-30 18:13:11 UTC (rev 107370)
+++ zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/tests/test_multicheckboxwidget.py 2009-12-30 18:36:02 UTC (rev 107371)
@@ -21,7 +21,7 @@
from zope.publisher.browser import TestRequest
from zope.schema import Choice, List
-from zope.app.form.interfaces import IInputWidget
+from zope.formlib.interfaces import IInputWidget
from zope.app.form.browser import MultiCheckBoxWidget
from zope.app.form.browser.tests.test_browserwidget import SimpleInputWidgetTest
from zope.interface.verify import verifyClass
Modified: zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/tests/test_objectwidget.py
===================================================================
--- zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/tests/test_objectwidget.py 2009-12-30 18:13:11 UTC (rev 107370)
+++ zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/tests/test_objectwidget.py 2009-12-30 18:36:02 UTC (rev 107371)
@@ -26,7 +26,7 @@
from zope.app.testing import ztapi
-from zope.app.form.interfaces import IInputWidget, MissingInputError
+from zope.formlib.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
@@ -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.formlib.interfaces.Mis"
in error_html)
- self.failUnless("name: <zope.app.form.interfaces.Miss"
+ self.failUnless("name: <zope.formlib.interfaces.Miss"
in error_html)
else:
self.failUnless("email: MissingInputError(u'field.foo.email', u'', None)"
Modified: zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/tests/test_passwordwidget.py
===================================================================
--- zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/tests/test_passwordwidget.py 2009-12-30 18:13:11 UTC (rev 107370)
+++ zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/tests/test_passwordwidget.py 2009-12-30 18:36:02 UTC (rev 107371)
@@ -17,7 +17,7 @@
"""
import unittest
from zope.testing import doctest
-from zope.app.form.interfaces import IInputWidget
+from zope.formlib.interfaces import IInputWidget
from zope.app.form.browser import PasswordWidget
from zope.app.form.browser.tests.test_browserwidget import SimpleInputWidgetTest
from zope.interface.verify import verifyClass
Modified: zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/tests/test_radiowidget.py
===================================================================
--- zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/tests/test_radiowidget.py 2009-12-30 18:13:11 UTC (rev 107370)
+++ zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/tests/test_radiowidget.py 2009-12-30 18:36:02 UTC (rev 107371)
@@ -22,7 +22,7 @@
from zope.publisher.browser import TestRequest
from zope.schema import Choice
-from zope.app.form.interfaces import IInputWidget
+from zope.formlib.interfaces import IInputWidget
from zope.app.form.browser import RadioWidget
from zope.app.form.browser.tests.test_browserwidget import SimpleInputWidgetTest
Modified: zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/tests/test_registrations.py
===================================================================
--- zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/tests/test_registrations.py 2009-12-30 18:13:11 UTC (rev 107370)
+++ zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/tests/test_registrations.py 2009-12-30 18:36:02 UTC (rev 107371)
@@ -28,7 +28,7 @@
# absolutely know what we're importing)
from zope.app.form.browser import *
-from zope.app.form.interfaces import IDisplayWidget, IInputWidget
+from zope.formlib.interfaces import IDisplayWidget, IInputWidget
import zope.app.form.browser
import zope.schema as fields
Modified: zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/tests/test_sequencewidget.py
===================================================================
--- zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/tests/test_sequencewidget.py 2009-12-30 18:13:11 UTC (rev 107370)
+++ zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/tests/test_sequencewidget.py 2009-12-30 18:36:02 UTC (rev 107371)
@@ -27,9 +27,9 @@
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.formlib.interfaces import IDisplayWidget
+from zope.formlib.interfaces import IInputWidget, MissingInputError
+from zope.formlib.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
Modified: zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/tests/test_textareawidget.py
===================================================================
--- zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/tests/test_textareawidget.py 2009-12-30 18:13:11 UTC (rev 107370)
+++ zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/tests/test_textareawidget.py 2009-12-30 18:36:02 UTC (rev 107371)
@@ -17,7 +17,7 @@
"""
import unittest
from zope.testing import doctest
-from zope.app.form.interfaces import IInputWidget
+from zope.formlib.interfaces import IInputWidget
from zope.app.form.browser import TextAreaWidget
from zope.app.form.browser.tests.test_browserwidget import SimpleInputWidgetTest
from zope.interface.verify import verifyClass
Modified: zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/tests/test_textwidget.py
===================================================================
--- zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/tests/test_textwidget.py 2009-12-30 18:13:11 UTC (rev 107370)
+++ zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/tests/test_textwidget.py 2009-12-30 18:36:02 UTC (rev 107371)
@@ -24,7 +24,7 @@
from zope.publisher.browser import TestRequest
from zope.schema import Password
-from zope.app.form.interfaces import IInputWidget
+from zope.formlib.interfaces import IInputWidget
from zope.app.form.browser import TextWidget
Modified: zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/tests/test_widgetdirective.py
===================================================================
--- zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/tests/test_widgetdirective.py 2009-12-30 18:13:11 UTC (rev 107370)
+++ zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/tests/test_widgetdirective.py 2009-12-30 18:36:02 UTC (rev 107371)
@@ -25,7 +25,7 @@
from zope.browser.interfaces import IAdding
import zope.app.form.browser.interfaces
-import zope.app.form.interfaces
+import zope.formlib.interfaces
from zope.app.form.tests import utils
import zope.component.testing
@@ -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.formlib.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.formlib.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.formlib.interfaces.IInputWidget.providedBy(w))
self.assertEqual(w.extraAttr, "168")
Modified: zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/tests/widgetDirectives.zcml
===================================================================
--- zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/tests/widgetDirectives.zcml 2009-12-30 18:13:11 UTC (rev 107370)
+++ zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/tests/widgetDirectives.zcml 2009-12-30 18:36:02 UTC (rev 107371)
@@ -8,7 +8,7 @@
<zope:view
type="zope.publisher.interfaces.browser.IBrowserRequest"
for="zope.schema.interfaces.ITextLine"
- provides="zope.app.form.interfaces.IInputWidget"
+ provides="zope.formlib.interfaces.IInputWidget"
factory="zope.app.form.browser.TextWidget"
permission="zope.Public"
/>
Modified: zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/textwidgets.py
===================================================================
--- zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/textwidgets.py 2009-12-30 18:13:11 UTC (rev 107370)
+++ zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/textwidgets.py 2009-12-30 18:36:02 UTC (rev 107371)
@@ -24,7 +24,7 @@
from zope.datetime import DateTimeError
from zope.i18n.format import DateTimeParseError
-from zope.app.form.interfaces import IInputWidget, ConversionError
+from zope.formlib.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
@@ -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.formlib.interfaces import ConversionError
>>> class TestTextAreaWidget(TextAreaWidget):
... def _toFieldValue(self, input):
... if 'foo' in input:
Modified: zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/widget.py
===================================================================
--- zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/widget.py 2009-12-30 18:13:11 UTC (rev 107370)
+++ zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/widget.py 2009-12-30 18:36:02 UTC (rev 107371)
@@ -25,9 +25,9 @@
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.formlib.interfaces import ConversionError
+from zope.formlib.interfaces import InputErrors
+from zope.formlib.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
@@ -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.formlib.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.formlib.interfaces import ConversionError
>>> class FloatWidget(SimpleInputWidget):
... def _toFieldValue(self, input):
... try:
Modified: zope.app.form/branches/faassen-zaf/src/zope/app/form/interfaces.py
===================================================================
--- zope.app.form/branches/faassen-zaf/src/zope/app/form/interfaces.py 2009-12-30 18:13:11 UTC (rev 107370)
+++ zope.app.form/branches/faassen-zaf/src/zope/app/form/interfaces.py 2009-12-30 18:36:02 UTC (rev 107371)
@@ -17,229 +17,17 @@
"""
__docformat__ = 'restructuredtext'
-from zope.schema.interfaces import ValidationError
-from zope.publisher.interfaces import IView
-from zope.interface import Attribute, Interface, implements
-from zope.schema import Bool
-from zope.exceptions.interfaces import UserError
+# this moved to zope.formlib.interfaces
+from zope.formlib.interfaces import (IWidgetInputError,
+ WidgetInputError,
+ MissingInputError,
+ ConversionError,
+ InputErrors,
+ ErrorContainer,
+ WidgetsError,
+ IWidget,
+ IInputWidget,
+ IDisplayWidget,
+ IWidgetFactory)
-class IWidgetInputError(Interface):
- """Placeholder for a snippet View"""
-
- def doc():
- """Returns a string that represents the error message."""
-
-class WidgetInputError(UserError):
- """One or more user input errors occurred."""
-
- implements(IWidgetInputError)
-
- def __init__(self, field_name, widget_title, errors=None):
- """Initialize Error
-
- `errors` is a ``ValidationError`` or a list of ValidationError objects
- """
- UserError.__init__(self, field_name, widget_title, errors)
- self.field_name = field_name
- self.widget_title = widget_title
- self.errors = errors
-
- def doc(self):
- # TODO this duck typing is to get the code working. See
- # collector issue 372
- if isinstance(self.errors, basestring):
- return self.errors
- elif getattr(self.errors, 'doc', None) is not None:
- return self.errors.doc()
- return ''
-
-
-class MissingInputError(WidgetInputError):
- """Required data was not supplied."""
-
-
-class ConversionError(Exception):
- """A conversion error occurred."""
-
- implements(IWidgetInputError)
-
- def __init__(self, error_name, original_exception=None):
- Exception.__init__(self, error_name, original_exception)
- self.error_name = error_name
- self.original_exception = original_exception
-
- def doc(self):
- return self.error_name
-
-InputErrors = WidgetInputError, ValidationError, ConversionError
-
-
-class ErrorContainer(Exception):
- """A base error class for collecting multiple errors."""
-
- def append(self, error):
- self.args += (error, )
-
- def __len__(self):
- return len(self.args)
-
- def __iter__(self):
- return iter(self.args)
-
- def __getitem__(self, i):
- return self.args[i]
-
- def __str__(self):
- return "\n".join(
- ["%s: %s" % (error.__class__.__name__, error)
- for error in self.args]
- )
-
- __repr__ = __str__
-
-class WidgetsError(ErrorContainer):
- """A collection of errors from widget processing.
-
- widgetValues is a map containing the list of values that were obtained
- from the widgets, keyed by field name.
- """
-
- def __init__(self, errors, widgetsData={}):
- ErrorContainer.__init__(self, *errors)
- self.widgetsData = widgetsData
-
-class IWidget(IView):
- """Generically describes the behavior of a widget.
-
- Note that this level must be still presentation independent.
- """
-
- name = Attribute(
- """The unique widget name
-
- This must be unique within a set of widgets.""")
-
- label = Attribute(
- """The widget label.
-
- Label may be translated for the request.
-
- The attribute may be implemented as either a read-write or read-only
- property, depending on the requirements for a specific implementation.
-
- """)
-
- hint = Attribute(
- """A hint regarding the use of the widget.
-
- Hints are traditionally rendered using tooltips in GUIs, but may be
- rendered differently depending on the UI implementation.
-
- Hint may be translated for the request.
-
- The attribute may be implemented as either a read-write or read-only
- property, depending on the requirements for a specific implementation.
-
- """)
-
- visible = Attribute(
- """A flag indicating whether or not the widget is visible.""")
-
- def setRenderedValue(value):
- """Set the value to be rendered by the widget.
-
- Calling this method will override any values provided by the user.
-
- For input widgets (`IInputWidget` implementations), calling
- this sets the value that will be rendered even if there is
- already user input.
-
- """
-
- def setPrefix(prefix):
- """Set the name prefix used for the widget
-
- The widget name is used to identify the widget's data within
- input data. For example, for HTTP forms, the widget name is
- used for the form key.
-
- It is acceptable to *reset* the prefix: set it once to read
- values from the request, and again to redraw with a different
- prefix but maintained state.
-
- """
-
-class IInputWidget(IWidget):
- """A widget for editing a field value."""
-
- required = Bool(
- title=u"Required",
- description=u"""If True, widget should be displayed as requiring input.
-
- By default, this value is the field's 'required' attribute. This
- field can be set to False for widgets that always provide input (e.g.
- a checkbox) to avoid unnecessary 'required' UI notations.
- """)
-
- def getInputValue():
- """Return value suitable for the widget's field.
-
- The widget must return a value that can be legally assigned to
- its bound field or otherwise raise ``WidgetInputError``.
-
- The return value is not affected by `setRenderedValue()`.
- """
-
- def applyChanges(content):
- """Validate the user input data and apply it to the content.
-
- Return a boolean indicating whether a change was actually applied.
-
- This raises an error if there is no user input.
- """
-
- def hasInput():
- """Returns ``True`` if the widget has input.
-
- Input is used by the widget to calculate an 'input value', which is
- a value that can be legally assigned to a field.
-
- Note that the widget may return ``True``, indicating it has input, but
- still be unable to return a value from `getInputValue`. Use
- `hasValidInput` to determine whether or not `getInputValue` will return
- a valid value.
-
- A widget that does not have input should generally not be used
- to update its bound field. Values set using
- `setRenderedValue()` do not count as user input.
-
- A widget that has been rendered into a form which has been
- submitted must report that it has input. If the form
- containing the widget has not been submitted, the widget
- shall report that it has no input.
-
- """
-
- def hasValidInput():
- """Returns ``True`` is the widget has valid input.
-
- This method is similar to `hasInput` but it also confirms that the
- input provided by the user can be converted to a valid field value
- based on the field constraints.
- """
-
-class IDisplayWidget(IWidget):
- """A widget for displaying a field value."""
-
- required = Bool(
- title=u"Required",
- description=u"""If True, widget should be displayed as requiring input.
-
- Display widgets should never be required.
- """)
-
-class IWidgetFactory(Interface):
- """A factory that creates the widget"""
-
- def __call__(context, request):
- """Return a widget"""
+
Modified: zope.app.form/branches/faassen-zaf/src/zope/app/form/tests/test_utility.py
===================================================================
--- zope.app.form/branches/faassen-zaf/src/zope/app/form/tests/test_utility.py 2009-12-30 18:13:11 UTC (rev 107370)
+++ zope.app.form/branches/faassen-zaf/src/zope/app/form/tests/test_utility.py 2009-12-30 18:36:02 UTC (rev 107371)
@@ -29,9 +29,9 @@
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.formlib.interfaces import IWidget, IInputWidget, IDisplayWidget
+from zope.formlib.interfaces import ConversionError, InputErrors, WidgetsError
+from zope.formlib.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
Modified: zope.app.form/branches/faassen-zaf/src/zope/app/form/tests/test_widget.py
===================================================================
--- zope.app.form/branches/faassen-zaf/src/zope/app/form/tests/test_widget.py 2009-12-30 18:13:11 UTC (rev 107370)
+++ zope.app.form/branches/faassen-zaf/src/zope/app/form/tests/test_widget.py 2009-12-30 18:36:02 UTC (rev 107371)
@@ -41,7 +41,7 @@
Widget implements IWidget:
>>> from zope.interface.verify import verifyClass
- >>> from zope.app.form.interfaces import IWidget
+ >>> from zope.formlib.interfaces import IWidget
>>> verifyClass(IWidget, Widget)
True
>>> widget = Widget(context, request)
@@ -106,7 +106,7 @@
that provides a getInputValue method:
>>> from zope.app.form import InputWidget
- >>> from zope.app.form.interfaces import WidgetInputError
+ >>> from zope.formlib.interfaces import WidgetInputError
>>> class TestInputWidget(InputWidget):
... def getInputValue(self):
... if self.context.required:
Modified: zope.app.form/branches/faassen-zaf/src/zope/app/form/utility.py
===================================================================
--- zope.app.form/branches/faassen-zaf/src/zope/app/form/utility.py 2009-12-30 18:13:11 UTC (rev 107370)
+++ zope.app.form/branches/faassen-zaf/src/zope/app/form/utility.py 2009-12-30 18:36:02 UTC (rev 107371)
@@ -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.formlib.interfaces import IWidget
+from zope.formlib.interfaces import WidgetsError, MissingInputError
+from zope.formlib.interfaces import InputErrors
+from zope.formlib.interfaces import IInputWidget, IDisplayWidget
+from zope.formlib.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