[Checkins] SVN: zope.app.form/branches/faassen-zaf/s Move the registrations out to zope.formlib.
Martijn Faassen
faassen at startifact.com
Wed Dec 30 17:49:33 EST 2009
Log message for revision 107400:
Move the registrations out to zope.formlib.
Changed:
U zope.app.form/branches/faassen-zaf/setup.py
U zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/configure.zcml
D zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/tests/registerWidgets.zcml
D zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/tests/test_registrations.py
-=-
Modified: zope.app.form/branches/faassen-zaf/setup.py
===================================================================
--- zope.app.form/branches/faassen-zaf/setup.py 2009-12-30 22:49:06 UTC (rev 107399)
+++ zope.app.form/branches/faassen-zaf/setup.py 2009-12-30 22:49:33 UTC (rev 107400)
@@ -40,10 +40,6 @@
+ '\n\n' +
read('src', 'zope', 'app', 'form', 'browser', 'widgets.txt')
+ '\n\n' +
- read('src', 'zope', 'app', 'form', 'browser', 'objectwidget.txt')
- + '\n\n' +
- read('src', 'zope', 'app', 'form', 'browser', 'source.txt')
- + '\n\n' +
read('src', 'zope', 'app', 'form', 'browser', 'i18n.txt')
+ '\n\n' +
read('CHANGES.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:49:06 UTC (rev 107399)
+++ zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/configure.zcml 2009-12-30 22:49:33 UTC (rev 107400)
@@ -2,6 +2,8 @@
xmlns="http://namespaces.zope.org/zope"
xmlns:browser="http://namespaces.zope.org/browser">
+ <include package="zope.formlib" file="configure.zcml" />
+
<!-- Form Macros -->
<browser:page
@@ -26,16 +28,7 @@
template="add.pt"
/>
- <!-- Views for Widget Errors -->
- <adapter
- for="zope.formlib.interfaces.IWidgetInputError
- zope.publisher.interfaces.browser.IBrowserRequest"
- provides="zope.app.form.browser.interfaces.IWidgetInputErrorView"
- factory="zope.app.form.browser.exception.WidgetInputErrorView"
- permission="zope.Public"
- />
-
<!-- Core display widgets -->
<adapter
Deleted: zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/tests/registerWidgets.zcml
===================================================================
--- zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/tests/registerWidgets.zcml 2009-12-30 22:49:06 UTC (rev 107399)
+++ zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/tests/registerWidgets.zcml 2009-12-30 22:49:33 UTC (rev 107400)
@@ -1,10 +0,0 @@
-<configure
- xmlns="http://namespaces.zope.org/zope"
- i18n_domain="zope">
-
- <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" />
-
-</configure>
Deleted: 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 22:49:06 UTC (rev 107399)
+++ zope.app.form/branches/faassen-zaf/src/zope/app/form/browser/tests/test_registrations.py 2009-12-30 22:49:33 UTC (rev 107400)
@@ -1,224 +0,0 @@
-##############################################################################
-#
-# Copyright (c) 2004 Zope Corporation and Contributors.
-# All Rights Reserved.
-#
-# This software is subject to the provisions of the Zope Public License,
-# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
-# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FOR A PARTICULAR PURPOSE.
-#
-##############################################################################
-"""Test widget registrations.
-
-$Id$
-"""
-import unittest
-
-from zope.component import getMultiAdapter
-from zope.configuration import xmlconfig
-from zope.interface import implements
-from zope.publisher.browser import TestRequest
-from zope.testing.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.formlib.interfaces import IDisplayWidget, IInputWidget
-import zope.app.form.browser
-
-import zope.schema as fields
-from zope.schema import interfaces
-from zope.schema import vocabulary
-
-class ISampleObject(interfaces.IField):
- pass
-
-class SampleObject(object):
- implements(ISampleObject)
-
-class ISampleVocabulary(interfaces.IVocabularyTokenized,
- interfaces.IVocabulary):
- pass
-
-class SampleVocabulary(vocabulary.SimpleVocabulary):
- implements(ISampleVocabulary)
-
-request = TestRequest()
-sample = SampleObject()
-vocab = SampleVocabulary([])
-
-def setUp(test):
- testing.setUp()
- context = xmlconfig.file("tests/registerWidgets.zcml",
- zope.app.form.browser)
-
-class Tests(object):
- """Documents and tests widgets registration for specific field types.
-
- Standard Widgets
- ------------------------------------------------------------------------
- The relationships between field types and standard widgets are listed
- below.
-
- IField, IDisplayWidget -> DisplayWidget
-
- >>> field = fields.Field()
- >>> widget = getMultiAdapter((field, request), IDisplayWidget)
- >>> isinstance(widget, DisplayWidget)
- True
-
- ITextLine, IInputWidget -> TextWidget
-
- >>> field = fields.TextLine()
- >>> widget = getMultiAdapter((field, request), IInputWidget)
- >>> isinstance(widget, TextWidget)
- True
-
- IText, IInputWidget -> TextAreaWidget
-
- >>> field = fields.Text()
- >>> widget = getMultiAdapter((field, request), IInputWidget)
- >>> isinstance(widget, TextAreaWidget)
- True
-
- ISourceText, IInputWidget -> TextAreaWidget
-
- >>> field = fields.SourceText()
- >>> widget = getMultiAdapter((field, request), IInputWidget)
- >>> isinstance(widget, TextAreaWidget)
- True
-
- IBytesLine, IInputWidget -> BytesWidget
-
- >>> field = fields.BytesLine()
- >>> widget = getMultiAdapter((field, request), IInputWidget)
- >>> isinstance(widget, BytesWidget)
- True
-
- IBytes, IInputWidget -> FileWidget
-
- >>> field = fields.Bytes()
- >>> widget = getMultiAdapter((field, request), IInputWidget)
- >>> isinstance(widget, FileWidget)
- True
-
- IASCIILine, IInputWidget -> ASCIIWidget
-
- >>> field = fields.ASCIILine()
- >>> widget = getMultiAdapter((field, request), IInputWidget)
- >>> isinstance(widget, ASCIIWidget)
- True
-
- IASCII, IInputWidget -> ASCIIAreaWidget
-
- >>> field = fields.ASCII()
- >>> widget = getMultiAdapter((field, request), IInputWidget)
- >>> isinstance(widget, ASCIIAreaWidget)
- True
-
- IInt, IInputWidget -> IntWidget
-
- >>> field = fields.Int()
- >>> widget = getMultiAdapter((field, request), IInputWidget)
- >>> isinstance(widget, IntWidget)
- True
-
- IFloat, IInputWidget -> FloatWidget
-
- >>> field = fields.Float()
- >>> widget = getMultiAdapter((field, request), IInputWidget)
- >>> isinstance(widget, FloatWidget)
- True
-
- IDecimal, IInputWidget -> DecimalWidget
-
- >>> field = fields.Decimal()
- >>> widget = getMultiAdapter((field, request), IInputWidget)
- >>> isinstance(widget, DecimalWidget)
- True
-
- IDatetime, IInputWidget -> DatetimeWidget
-
- >>> field = fields.Datetime()
- >>> widget = getMultiAdapter((field, request), IInputWidget)
- >>> isinstance(widget, DatetimeWidget)
- True
-
- IDate, IInputWidget -> DateWidget
-
- >>> field = fields.Date()
- >>> widget = getMultiAdapter((field, request), IInputWidget)
- >>> isinstance(widget, DateWidget)
- True
-
- IBool, IInputWidget -> CheckBoxWidget
-
- >>> field = fields.Bool()
- >>> widget = getMultiAdapter((field, request), IInputWidget)
- >>> isinstance(widget, CheckBoxWidget)
- True
-
- ITuple, IInputWidget -> TupleSequenceWidget
-
- >>> field = fields.Tuple(value_type=fields.Int())
- >>> widget = getMultiAdapter((field, request), IInputWidget)
- >>> isinstance(widget, TupleSequenceWidget)
- True
-
- IList, IInputWidget -> ListSequenceWidget
-
- >>> field = fields.List(value_type=fields.Int())
- >>> widget = getMultiAdapter((field, request), IInputWidget)
- >>> isinstance(widget, ListSequenceWidget)
- True
-
- IPassword, IInputWidget -> PasswordWidget
-
- >>> field = fields.Password()
- >>> widget = getMultiAdapter((field, request), IInputWidget)
- >>> isinstance(widget, PasswordWidget)
- True
-
- IChoice, IDisplayWidget -> ItemDisplayWidget
-
- >>> field = fields.Choice(vocabulary=vocab)
- >>> field = field.bind(sample)
- >>> widget = getMultiAdapter((field, request), IDisplayWidget)
- >>> isinstance(widget, ItemDisplayWidget)
- True
-
- IChoice, IInputWidget -> DropdownWidget
-
- >>> field = fields.Choice(vocabulary=vocab)
- >>> field = field.bind(sample)
- >>> widget = getMultiAdapter((field, request), IInputWidget)
- >>> isinstance(widget, DropdownWidget)
- True
-
- IList with IChoice value_type, IDisplayWidget -> ItemsMultiDisplayWidget
-
- >>> field = fields.List(value_type=fields.Choice(vocabulary=vocab))
- >>> field = field.bind(sample)
- >>> widget = getMultiAdapter((field, request), IDisplayWidget)
- >>> isinstance(widget, ItemsMultiDisplayWidget)
- True
-
- IList with IChoice value_type, IInputWidget -> MultiSelectWidget
-
- >>> field = fields.List(value_type=fields.Choice(vocabulary=vocab))
- >>> field = field.bind(sample)
- >>> widget = getMultiAdapter((field, request), IInputWidget)
- >>> isinstance(widget, OrderedMultiSelectWidget)
- True
- """
-
-def test_suite():
- return DocTestSuite(setUp=setUp, tearDown=testing.tearDown)
-
-if __name__=='__main__':
- unittest.main(defaultTest='test_suite')
More information about the checkins
mailing list