[Checkins] SVN: zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/ Really remove registrations and fix a few more imports.
Martijn Faassen
faassen at startifact.com
Wed Dec 30 17:59:07 EST 2009
Log message for revision 107402:
Really remove registrations and fix a few more imports.
Changed:
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/i18n.txt
-=-
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 22:56:20 UTC (rev 107401)
+++ zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/configure.zcml 2009-12-30 22:59:06 UTC (rev 107402)
@@ -29,554 +29,6 @@
/>
- <!-- Core display widgets -->
-
- <adapter
- for="zope.schema.interfaces.IField
- zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.formlib.interfaces.IDisplayWidget"
- factory=".DisplayWidget"
- permission="zope.Public"
- />
-
- <adapter
- for="zope.schema.interfaces.IBool
- zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.formlib.interfaces.IDisplayWidget"
- factory=".boolwidgets.BooleanDisplayWidget"
- permission="zope.Public"
- />
-
- <adapter
- for="zope.schema.interfaces.IBytes
- zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.formlib.interfaces.IDisplayWidget"
- factory=".textwidgets.BytesDisplayWidget"
- permission="zope.Public"
- />
-
- <adapter
- for="zope.schema.interfaces.IBytesLine
- zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.formlib.interfaces.IDisplayWidget"
- factory=".DisplayWidget"
- permission="zope.Public"
- />
-
- <adapter
- for="zope.schema.interfaces.IASCII
- zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.formlib.interfaces.IDisplayWidget"
- factory=".textwidgets.ASCIIDisplayWidget"
- permission="zope.Public"
- />
-
- <adapter
- for="zope.schema.interfaces.IASCIILine
- zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.formlib.interfaces.IDisplayWidget"
- factory=".DisplayWidget"
- permission="zope.Public"
- />
-
- <adapter
- for="zope.schema.interfaces.IURI
- zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.formlib.interfaces.IDisplayWidget"
- factory=".textwidgets.URIDisplayWidget"
- permission="zope.Public"
- />
-
- <adapter
- for="zope.schema.interfaces.IDate
- zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.formlib.interfaces.IDisplayWidget"
- factory=".DateDisplayWidget"
- permission="zope.Public"
- />
-
- <adapter
- for="zope.schema.interfaces.IDatetime
- zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.formlib.interfaces.IDisplayWidget"
- factory=".DatetimeDisplayWidget"
- permission="zope.Public"
- />
-
- <!-- Core edit widgets -->
-
- <adapter
- for="zope.schema.interfaces.ITextLine
- zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.app.form.browser.interfaces.ITextBrowserWidget"
- factory=".TextWidget"
- permission="zope.Public"
- />
-
- <adapter
- for="zope.schema.interfaces.IText
- zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.app.form.browser.interfaces.ISimpleInputWidget"
- factory=".TextAreaWidget"
- permission="zope.Public"
- />
-
- <adapter
- for="zope.schema.interfaces.ISourceText
- zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.app.form.browser.interfaces.ISimpleInputWidget"
- factory=".TextAreaWidget"
- permission="zope.Public"
- />
-
- <adapter
- for="zope.schema.interfaces.IBytesLine
- zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.app.form.browser.interfaces.ISimpleInputWidget"
- factory=".BytesWidget"
- permission="zope.Public"
- />
-
- <adapter
- for="zope.schema.interfaces.IBytes
- zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.app.form.browser.interfaces.ISimpleInputWidget"
- factory=".FileWidget"
- permission="zope.Public"
- />
-
- <adapter
- for="zope.schema.interfaces.IASCII
- zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.app.form.browser.interfaces.ISimpleInputWidget"
- factory=".ASCIIAreaWidget"
- permission="zope.Public"
- />
-
- <adapter
- for="zope.schema.interfaces.IASCIILine
- zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.app.form.browser.interfaces.ISimpleInputWidget"
- factory=".ASCIIWidget"
- permission="zope.Public"
- />
-
- <adapter
- for="zope.schema.interfaces.IInt
- zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.app.form.browser.interfaces.ISimpleInputWidget"
- factory=".IntWidget"
- permission="zope.Public"
- />
-
- <adapter
- for="zope.schema.interfaces.IInt
- zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.formlib.interfaces.IDisplayWidget"
- factory=".UnicodeDisplayWidget"
- permission="zope.Public"
- />
-
- <adapter
- for="zope.schema.interfaces.IFloat
- zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.app.form.browser.interfaces.ISimpleInputWidget"
- factory=".FloatWidget"
- permission="zope.Public"
- />
-
- <adapter
- for="zope.schema.interfaces.IFloat
- zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.formlib.interfaces.IDisplayWidget"
- factory=".UnicodeDisplayWidget"
- permission="zope.Public"
- />
-
- <adapter
- for="zope.schema.interfaces.IDecimal
- zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.app.form.browser.interfaces.ISimpleInputWidget"
- factory=".DecimalWidget"
- permission="zope.Public"
- />
-
- <adapter
- for="zope.schema.interfaces.IDecimal
- zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.formlib.interfaces.IDisplayWidget"
- factory=".UnicodeDisplayWidget"
- permission="zope.Public"
- />
-
- <adapter
- for="zope.schema.interfaces.IDatetime
- zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.app.form.browser.interfaces.ISimpleInputWidget"
- factory=".DatetimeWidget"
- permission="zope.Public"
- />
-
- <adapter
- for="zope.schema.interfaces.IDate
- zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.app.form.browser.interfaces.ISimpleInputWidget"
- factory=".DateWidget"
- permission="zope.Public"
- />
-
- <adapter
- for="zope.schema.interfaces.IBool
- zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.app.form.browser.interfaces.ISimpleInputWidget"
- factory=".CheckBoxWidget"
- permission="zope.Public"
- />
-
- <adapter
- for="zope.schema.interfaces.IPassword
- zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.app.form.browser.interfaces.ISimpleInputWidget"
- factory=".PasswordWidget"
- permission="zope.Public"
- />
-
- <!-- Items-related widgets; they are proxies for the multiviews below. -->
-
- <!-- Choices (dispatch to field + vocabulary lookup) -->
- <adapter
- for="zope.schema.interfaces.IChoice
- zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.formlib.interfaces.IDisplayWidget"
- factory=".ChoiceDisplayWidget"
- permission="zope.Public"
- />
-
- <adapter
- for="zope.schema.interfaces.IChoice
- zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.app.form.browser.interfaces.ISimpleInputWidget"
- factory=".ChoiceInputWidget"
- permission="zope.Public"
- />
-
- <!-- Generic collections (dispatch to field + value_type lookup) -->
- <adapter
- for="zope.schema.interfaces.ICollection
- zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.formlib.interfaces.IDisplayWidget"
- factory=".CollectionDisplayWidget"
- permission="zope.Public"
- />
-
- <adapter
- for="zope.schema.interfaces.ICollection
- zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.app.form.browser.interfaces.ISimpleInputWidget"
- factory=".CollectionInputWidget"
- permission="zope.Public"
- />
-
- <!--
-
- Need to repeat the above for Sequence to avoid being overridden by a
- DAV widget. This suggests that we should be getting something
- more specific than IInputWidget.
-
- -->
- <adapter
- for="zope.schema.interfaces.ISequence
- zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.formlib.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"
- factory=".CollectionInputWidget"
- permission="zope.Public"
- />
-
-
-
- <!-- non-choice collection fields should register for the field + value type
- so as to allow specific field + value_type widgets such as the Choice
- pattern -->
- <adapter
- for="zope.schema.interfaces.ITuple
- zope.schema.interfaces.IField
- zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.app.form.browser.interfaces.ISimpleInputWidget"
- factory=".TupleSequenceWidget"
- permission="zope.Public"
- />
-
- <adapter
- for="zope.schema.interfaces.IList
- zope.schema.interfaces.IField
- zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.app.form.browser.interfaces.ISimpleInputWidget"
- factory=".ListSequenceWidget"
- permission="zope.Public"
- />
-
- <adapter
- for="zope.schema.interfaces.ISequence
- zope.schema.interfaces.IField
- zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.formlib.interfaces.IDisplayWidget"
- factory=".SequenceDisplayWidget"
- permission="zope.Public"
- />
-
- <!-- Choice collections. dispatch to field + vocabulary lookup.
- We must register the collection + choice factories for all ICollection
- subclasses because the field (the collection) has precedence: therefore
- a registration for (IList plus IField) would trump a registration for
- (ICollection plus IChoice), making choice lists not look up properly.
- So all new collection types should always register for IChoice if
- they want to follow in this configuration pattern. -->
- <!-- List + Choice -->
- <adapter
- for="zope.schema.interfaces.IList
- zope.schema.interfaces.IChoice
- zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.formlib.interfaces.IDisplayWidget"
- factory=".ChoiceCollectionDisplayWidget"
- permission="zope.Public"
- />
-
- <adapter
- for="zope.schema.interfaces.IList
- zope.schema.interfaces.IChoice
- zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.app.form.browser.interfaces.ISimpleInputWidget"
- factory=".ChoiceCollectionInputWidget"
- permission="zope.Public"
- />
-
- <!-- Tuple + Choice -->
- <adapter
- for="zope.schema.interfaces.ITuple
- zope.schema.interfaces.IChoice
- zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.formlib.interfaces.IDisplayWidget"
- factory=".ChoiceCollectionDisplayWidget"
- permission="zope.Public"
- />
-
- <adapter
- for="zope.schema.interfaces.ITuple
- zope.schema.interfaces.IChoice
- zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.app.form.browser.interfaces.ISimpleInputWidget"
- factory=".ChoiceCollectionInputWidget"
- permission="zope.Public"
- />
-
- <!-- Set + Choice -->
- <adapter
- for="zope.schema.interfaces.ISet
- zope.schema.interfaces.IChoice
- zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.formlib.interfaces.IDisplayWidget"
- factory=".ChoiceCollectionDisplayWidget"
- permission="zope.Public"
- />
-
- <adapter
- for="zope.schema.interfaces.ISet
- zope.schema.interfaces.IChoice
- zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.app.form.browser.interfaces.ISimpleInputWidget"
- factory=".ChoiceCollectionInputWidget"
- permission="zope.Public"
- />
-
- <!-- FrozenSet + Choice -->
- <adapter
- for="zope.schema.interfaces.IFrozenSet
- zope.schema.interfaces.IChoice
- zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.formlib.interfaces.IDisplayWidget"
- factory=".ChoiceCollectionDisplayWidget"
- permission="zope.Public"
- />
-
- <adapter
- for="zope.schema.interfaces.IFrozenSet
- zope.schema.interfaces.IChoice
- zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.app.form.browser.interfaces.ISimpleInputWidget"
- factory=".ChoiceCollectionInputWidget"
- permission="zope.Public"
- />
-
- <!-- Default Multi-Views for fields and vocabularies -->
-
- <adapter
- for="zope.schema.interfaces.IChoice
- zope.schema.interfaces.IBaseVocabulary
- zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.formlib.interfaces.IDisplayWidget"
- factory=".ItemDisplayWidget"
- permission="zope.Public"
- />
-
- <adapter
- for="zope.schema.interfaces.IChoice
- zope.schema.interfaces.IVocabularyTokenized
- zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.app.form.browser.interfaces.ISimpleInputWidget"
- factory=".DropdownWidget"
- permission="zope.Public"
- />
-
- <!-- Default Multi-Views for fields and iterable sources -->
-
- <adapter
- for="zope.schema.interfaces.ISet
- zope.schema.interfaces.IIterableSource
- zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.app.form.browser.interfaces.ISimpleInputWidget"
- factory=".source.SourceMultiSelectSetWidget"
- permission="zope.Public"
- />
-
- <adapter
- for="zope.schema.interfaces.IFrozenSet
- zope.schema.interfaces.IIterableSource
- zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.app.form.browser.interfaces.ISimpleInputWidget"
- factory=".source.SourceMultiSelectFrozenSetWidget"
- permission="zope.Public"
- />
-
- <adapter
- for="zope.schema.interfaces.IChoice
- zope.schema.interfaces.IIterableSource
- zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.app.form.browser.interfaces.ISimpleInputWidget"
- factory=".source.SourceDropdownWidget"
- permission="zope.Public"
- />
-
- <adapter
- for="zope.schema.interfaces.IList
- zope.schema.interfaces.IIterableSource
- zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.app.form.browser.interfaces.ISimpleInputWidget"
- factory=".source.SourceOrderedMultiSelectWidget"
- permission="zope.Public"
- />
-
- <!-- These widgets are minimal and only support lists with unique members,
- without ordering capabilities -->
-
- <adapter
- for="zope.schema.interfaces.ISet
- zope.schema.interfaces.IVocabularyTokenized
- zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.app.form.browser.interfaces.ISimpleInputWidget"
- factory=".MultiSelectSetWidget"
- permission="zope.Public"
- />
-
- <adapter
- for="zope.schema.interfaces.IFrozenSet
- zope.schema.interfaces.IVocabularyTokenized
- zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.app.form.browser.interfaces.ISimpleInputWidget"
- factory=".MultiSelectFrozenSetWidget"
- permission="zope.Public"
- />
-
- <adapter
- for="zope.schema.interfaces.ISet
- zope.schema.interfaces.IBaseVocabulary
- zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.formlib.interfaces.IDisplayWidget"
- factory=".SetDisplayWidget"
- permission="zope.Public"
- />
-
- <adapter
- for="zope.schema.interfaces.IFrozenSet
- zope.schema.interfaces.IBaseVocabulary
- zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.formlib.interfaces.IDisplayWidget"
- factory=".SetDisplayWidget"
- permission="zope.Public"
- />
-
- <adapter
- for="zope.schema.interfaces.IList
- zope.schema.interfaces.IVocabularyTokenized
- zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.app.form.browser.interfaces.ISimpleInputWidget"
- factory=".OrderedMultiSelectWidget"
- permission="zope.Public"
- />
-
- <adapter
- for="zope.schema.interfaces.IList
- zope.schema.interfaces.IBaseVocabulary
- zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.formlib.interfaces.IDisplayWidget"
- factory=".SetDisplayWidget"
- permission="zope.Public"
- />
-
- <!-- Source Views -->
- <adapter
- for="zope.schema.interfaces.IChoice
- zope.schema.interfaces.ISource
- zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.formlib.interfaces.IDisplayWidget"
- factory=".source.SourceDisplayWidget"
- permission="zope.Public"
- />
- <adapter
- for="zope.schema.interfaces.IChoice
- zope.schema.interfaces.ISource
- zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.app.form.browser.interfaces.ISimpleInputWidget"
- factory=".source.SourceInputWidget"
- permission="zope.Public"
- />
-
- <adapter
- for="zope.schema.interfaces.ISequence
- zope.schema.interfaces.ISource
- zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.formlib.interfaces.IDisplayWidget"
- factory=".source.SourceSequenceDisplayWidget"
- permission="zope.Public"
- />
-
- <adapter
- for="zope.schema.interfaces.IAbstractSet
- zope.schema.interfaces.ISource
- zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.formlib.interfaces.IDisplayWidget"
- factory=".source.SourceSequenceDisplayWidget"
- permission="zope.Public"
- />
-
-
-
- <!-- TODO We need a widget for tuples (and sets, for that matter). -->
- <adapter
- for="zope.schema.interfaces.IList
- zope.schema.interfaces.ISource
- zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.app.form.browser.interfaces.ISimpleInputWidget"
- factory=".source.SourceListInputWidget"
- permission="zope.Public"
- />
-
<!-- Register the form documentation with the apidoc tool -->
<configure
xmlns:apidoc="http://namespaces.zope.org/apidoc"
Modified: zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/i18n.txt
===================================================================
--- zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/i18n.txt 2009-12-30 22:56:20 UTC (rev 107401)
+++ zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/i18n.txt 2009-12-30 22:59:06 UTC (rev 107402)
@@ -126,11 +126,12 @@
... title=u"Kinds of coffee beans",
... source=Coffees())
>>> request = TestRequest()
- >>> widget = zope.app.form.browser.source.SourceDisplayWidget(
+ >>> import zope.formlib.source
+ >>> widget = zope.formlib.source.SourceDisplayWidget(
... coffee, coffee.source, request)
>>> print widget()
Nothing
- >>> from zope.app.form.browser.interfaces import IBrowserWidget
+ >>> from zope.formlib.interfaces import IBrowserWidget
>>> IBrowserWidget.providedBy(widget)
True
>>> widget.setRenderedValue('arabica')
More information about the checkins
mailing list