[Checkins] SVN: z3c.widget/trunk/ - Updated tests to run with `zope.formlib` 4.0 and `zope.schema` 3.6.
Michael Howitz
mh at gocept.com
Thu Nov 11 02:50:38 EST 2010
Log message for revision 118335:
- Updated tests to run with `zope.formlib` 4.0 and `zope.schema` 3.6.
- Using Python's ``doctest`` module instead of depreacted ``zope.testing.doctest[unit]``.
Changed:
U z3c.widget/trunk/CHANGES.txt
U z3c.widget/trunk/setup.py
U z3c.widget/trunk/src/z3c/widget/autocomplete/demo/tests.py
U z3c.widget/trunk/src/z3c/widget/autocomplete/ftesting.zcml
U z3c.widget/trunk/src/z3c/widget/autocomplete/tests.py
U z3c.widget/trunk/src/z3c/widget/country/tests.py
U z3c.widget/trunk/src/z3c/widget/dateselect/README.txt
U z3c.widget/trunk/src/z3c/widget/dateselect/browser.py
U z3c.widget/trunk/src/z3c/widget/dateselect/tests.py
U z3c.widget/trunk/src/z3c/widget/dropdowndatewidget/tests.py
U z3c.widget/trunk/src/z3c/widget/flashupload/README.txt
U z3c.widget/trunk/src/z3c/widget/flashupload/tests.py
U z3c.widget/trunk/src/z3c/widget/image/tests.py
U z3c.widget/trunk/src/z3c/widget/namespace/README.txt
U z3c.widget/trunk/src/z3c/widget/namespace/tests.py
U z3c.widget/trunk/src/z3c/widget/optdropdown/README.txt
U z3c.widget/trunk/src/z3c/widget/optdropdown/tests.py
U z3c.widget/trunk/src/z3c/widget/sequence/tests.py
U z3c.widget/trunk/src/z3c/widget/sequence/widget.py
U z3c.widget/trunk/src/z3c/widget/ssn/README.txt
U z3c.widget/trunk/src/z3c/widget/ssn/browser.py
U z3c.widget/trunk/src/z3c/widget/ssn/tests.py
U z3c.widget/trunk/src/z3c/widget/tiny/tests.py
U z3c.widget/trunk/src/z3c/widget/usphone/README.txt
U z3c.widget/trunk/src/z3c/widget/usphone/browser.py
U z3c.widget/trunk/src/z3c/widget/usphone/tests.py
-=-
Modified: z3c.widget/trunk/CHANGES.txt
===================================================================
--- z3c.widget/trunk/CHANGES.txt 2010-11-11 07:10:06 UTC (rev 118334)
+++ z3c.widget/trunk/CHANGES.txt 2010-11-11 07:50:38 UTC (rev 118335)
@@ -2,14 +2,20 @@
Changes for z3c.widget
======================
-unreleased 0.2.2dev
-===================
-
- - added translation for french
+0.3.0 (unreleased)
+==================
+ - Added translation for french.
+
+ - Updated tests to run with `zope.formlib` 4.0 and `zope.schema` 3.6.
+
+ - Using Python's ``doctest`` module instead of depreacted
+ ``zope.testing.doctest[unit]``.
+
+
2008/01/29 0.2.1
================
-
+
- add translation for hungarian and romanian languages
2007/09/21 0.2.0
Modified: z3c.widget/trunk/setup.py
===================================================================
--- z3c.widget/trunk/setup.py 2010-11-11 07:10:06 UTC (rev 118334)
+++ z3c.widget/trunk/setup.py 2010-11-11 07:50:38 UTC (rev 118335)
@@ -2,12 +2,12 @@
from setuptools import setup, find_packages
setup(name='z3c.widget',
- version='0.1.7',
+ version='0.3.0dev',
author = "Zope Community",
- author_email = "zope3-dev at zope.org",
- description = "Additional Zope3 Widgets",
+ author_email = "zope-dev at zope.org",
+ description = "Additional zope.formlib Widgets",
license = "ZPL 2.1",
- keywords = "zope zope3",
+ keywords = "zope zope3 form formlib",
url='http://svn.zope.org/z3c.widget',
zip_safe=False,
packages=find_packages('src'),
@@ -29,19 +29,18 @@
'zope.app.cache',
'zope.app.container',
'zope.app.file',
- 'zope.app.form',
'zope.app.i18n',
'zope.app.pagetemplate',
'zope.component',
'zope.event',
'zope.filerepresentation',
- 'zope.formlib',
+ 'zope.formlib >= 4.0',
'zope.i18n',
'zope.i18nmessageid',
'zope.interface',
'zope.lifecycleevent',
'zope.publisher',
- 'zope.schema',
+ 'zope.schema >= 3.6',
'zope.security',
'zope.traversing',
],
Modified: z3c.widget/trunk/src/z3c/widget/autocomplete/demo/tests.py
===================================================================
--- z3c.widget/trunk/src/z3c/widget/autocomplete/demo/tests.py 2010-11-11 07:10:06 UTC (rev 118334)
+++ z3c.widget/trunk/src/z3c/widget/autocomplete/demo/tests.py 2010-11-11 07:50:38 UTC (rev 118335)
@@ -1,23 +1,18 @@
import doctest
import unittest
-from zope.testing.doctestunit import DocTestSuite
from zope.app.testing import setup
+
def setUp(test):
setup.placefulSetUp(True)
+
def tearDown(test):
setup.placefulTearDown()
-def test_suite():
-
- return unittest.TestSuite(
- (
- DocTestSuite('z3c.widget.autocomplete.demo.countries',
- setUp=setUp,tearDown=tearDown,
- optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS,
- ),
- ))
-if __name__ == '__main__':
- unittest.main(defaultTest='test_suite')
+def test_suite():
+ return doctest.DocTestSuite(
+ 'z3c.widget.autocomplete.demo.countries',
+ setUp=setUp,tearDown=tearDown,
+ optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS)
Modified: z3c.widget/trunk/src/z3c/widget/autocomplete/ftesting.zcml
===================================================================
--- z3c.widget/trunk/src/z3c/widget/autocomplete/ftesting.zcml 2010-11-11 07:10:06 UTC (rev 118334)
+++ z3c.widget/trunk/src/z3c/widget/autocomplete/ftesting.zcml 2010-11-11 07:50:38 UTC (rev 118335)
@@ -3,20 +3,14 @@
xmlns:zcml="http://namespaces.zope.org/zcml"
i18n_domain="zope">
- <include package="zope.app.securitypolicy" file="meta.zcml" />
-
- <include
- zcml:condition="installed zope.app.zcmlfiles"
- package="zope.app.zcmlfiles"
- />
- <include
- zcml:condition="not-installed zope.app.zcmlfiles"
- package="zope.app"
- />
+ <include package="zope.securitypolicy" file="meta.zcml" />
+
+ <include package="zope.app.zcmlfiles" />
<include package="zope.app.authentication" />
+ <include package="zope.login" />
<securityPolicy
- component="zope.app.securitypolicy.zopepolicy.ZopeSecurityPolicy" />
+ component="zope.securitypolicy.zopepolicy.ZopeSecurityPolicy" />
<include package="zope.app.securitypolicy" />
<include package="zc.resourcelibrary" file="meta.zcml"/>
<include package="zc.resourcelibrary" />
@@ -37,7 +31,7 @@
title="Administrator"
login="mgr"
password="mgrpw" />
-
+
<grant
role="zope.Manager"
principal="zope.manager"
Modified: z3c.widget/trunk/src/z3c/widget/autocomplete/tests.py
===================================================================
--- z3c.widget/trunk/src/z3c/widget/autocomplete/tests.py 2010-11-11 07:10:06 UTC (rev 118334)
+++ z3c.widget/trunk/src/z3c/widget/autocomplete/tests.py 2010-11-11 07:50:38 UTC (rev 118335)
@@ -1,6 +1,5 @@
import doctest
import unittest
-from zope.testing.doctestunit import DocFileSuite
from zope.app.testing import setup
def setUp(test):
@@ -10,14 +9,7 @@
setup.placefulTearDown()
def test_suite():
-
- return unittest.TestSuite(
- (
- DocFileSuite('README.txt',
- setUp=setUp,tearDown=tearDown,
- optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS,
- ),
- ))
-
-if __name__ == '__main__':
- unittest.main(defaultTest='test_suite')
+ return doctest.DocFileSuite(
+ 'README.txt',
+ setUp=setUp, tearDown=tearDown,
+ optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS)
Modified: z3c.widget/trunk/src/z3c/widget/country/tests.py
===================================================================
--- z3c.widget/trunk/src/z3c/widget/country/tests.py 2010-11-11 07:10:06 UTC (rev 118334)
+++ z3c.widget/trunk/src/z3c/widget/country/tests.py 2010-11-11 07:50:38 UTC (rev 118335)
@@ -11,25 +11,17 @@
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
-"""Optional Dropdown Widget Tests
+"""Optional Dropdown Widget Tests"""
-$Id$
-"""
-__docformat__ = "reStructuredText"
import doctest
import unittest
-from zope.testing import doctestunit
from zope.app.testing import placelesssetup
+from pprint import pprint
-def test_suite():
- return unittest.TestSuite((
- doctestunit.DocFileSuite(
- 'README.txt',
- setUp=placelesssetup.setUp, tearDown=placelesssetup.tearDown,
- globs={'pprint': doctestunit.pprint},
- optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS),
- ))
-if __name__ == '__main__':
- unittest.main(defaultTest='test_suite')
-
+def test_suite():
+ return doctest.DocFileSuite(
+ 'README.txt',
+ setUp=placelesssetup.setUp, tearDown=placelesssetup.tearDown,
+ globs={'pprint': pprint},
+ optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS)
Modified: z3c.widget/trunk/src/z3c/widget/dateselect/README.txt
===================================================================
--- z3c.widget/trunk/src/z3c/widget/dateselect/README.txt 2010-11-11 07:10:06 UTC (rev 118334)
+++ z3c.widget/trunk/src/z3c/widget/dateselect/README.txt 2010-11-11 07:50:38 UTC (rev 118335)
@@ -176,8 +176,8 @@
...
WidgetInputError: ('field', u'Birthday', u'day is out of range for month')
- >>> widget._error
- <zope.app.form.interfaces.WidgetInputError ...>
+ >>> widget._error.__class__
+ <class 'zope.formlib.interfaces.WidgetInputError'>
``applyChanges(content)`` Method
@@ -314,7 +314,7 @@
>>> widget.getInputValue()
Traceback (most recent call last):
...
- ConversionError: ('Invalid value', token '99' not found in vocabulary)
+ ConversionError: (u'Invalid value', InvalidValue("token '99' not found in vocabulary"))
>>> print widget.error()
<span class="error">Invalid value</span>
@@ -328,7 +328,7 @@
>>> widget.getInputValue()
Traceback (most recent call last):
...
- ConversionError: ('Invalid value', token '0' not found in vocabulary)
+ ConversionError: (u'Invalid value', InvalidValue("token '0' not found in vocabulary"))
>>> print widget.error()
<span class="error">Invalid value</span>
@@ -342,7 +342,7 @@
>>> widget.getInputValue()
Traceback (most recent call last):
...
- ConversionError: ('Invalid value', token '1900' not found in vocabulary)
+ ConversionError: (u'Invalid value', InvalidValue("token '1900' not found in vocabulary"))
>>> print widget.error()
<span class="error">Invalid value</span>
Modified: z3c.widget/trunk/src/z3c/widget/dateselect/browser.py
===================================================================
--- z3c.widget/trunk/src/z3c/widget/dateselect/browser.py 2010-11-11 07:10:06 UTC (rev 118334)
+++ z3c.widget/trunk/src/z3c/widget/dateselect/browser.py 2010-11-11 07:50:38 UTC (rev 118335)
@@ -11,26 +11,20 @@
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
-"""
-$Id$
-"""
-__docformat__ = 'reStructuredText'
-
-import datetime
-import zope.interface
-import zope.schema
-from zope.formlib import form
+from z3c.i18n import MessageFactory as _
+from zope.app.form import browser
+from zope.app.form.browser.interfaces import IBrowserWidget
+from zope.app.form.browser.interfaces import IWidgetInputErrorView
from zope.app.form.interfaces import IInputWidget
from zope.app.form.interfaces import WidgetInputError
-from zope.app.form.browser.interfaces import IBrowserWidget
-from zope.app.form import browser
from zope.app.pagetemplate import ViewPageTemplateFile
-from zope.app.zapi import getMultiAdapter
-from zope.app.form.browser.interfaces import IWidgetInputErrorView
+from zope.formlib import form
+import datetime
+import zope.component
+import zope.interface
+import zope.schema
-from z3c.i18n import MessageFactory as _
-
class DropdownWidget(browser.SelectWidget):
"""Variation of the SelectWidget that uses a drop-down list.
@@ -91,7 +85,7 @@
for a DateSelectWidget and is also able to set a the right values in
the year vocabulary given from the yearRange attribute in the
DateSelectWidget.
- Note: this adapter is internal used for setUpEditWidget in formlib and
+ Note: this adapter is internal used for setUpEditWidget in formlib and
not registred in the adapter registry.
"""
@@ -153,7 +147,7 @@
self.context = field
self.request = request
if self.context.initialDate:
- self.initialDate = self.context.initialDate
+ self.initialDate = self.context.initialDate
else:
self.initialDate = datetime.date.today()
value = field.query(field.context, default=self.initialDate)
@@ -164,9 +158,9 @@
self.name = self._prefix + field.__name__
adapters = {}
- adapters[IDateSelectData] = DateSelectDataForDateSelectWidget(self,
+ adapters[IDateSelectData] = DateSelectDataForDateSelectWidget(self,
value)
- self.widgets = form.setUpEditWidgets(form.FormFields(IDateSelectData),
+ self.widgets = form.setUpEditWidgets(form.FormFields(IDateSelectData),
self.name, value, request, adapters=adapters)
def setRenderedValue(self, value):
@@ -241,8 +235,9 @@
def error(self):
"""See zope.app.form.browser.interfaces.IBrowserWidget"""
if self._error:
- return getMultiAdapter((self._error, self.request),
- IWidgetInputErrorView).snippet()
+ return zope.component.getMultiAdapter(
+ (self._error, self.request),
+ IWidgetInputErrorView).snippet()
year_error = self.widgets['year'].error()
if year_error:
return year_error
Modified: z3c.widget/trunk/src/z3c/widget/dateselect/tests.py
===================================================================
--- z3c.widget/trunk/src/z3c/widget/dateselect/tests.py 2010-11-11 07:10:06 UTC (rev 118334)
+++ z3c.widget/trunk/src/z3c/widget/dateselect/tests.py 2010-11-11 07:50:38 UTC (rev 118335)
@@ -11,27 +11,15 @@
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
-"""
-$Id$
-"""
-__docformat__ = "reStructuredText"
+from z3c.widget.dateselect import testing
import doctest
import unittest
import zope.schema
-from zope.testing.doctestunit import DocFileSuite
-from z3c.widget.dateselect import testing
-
def test_suite():
- return unittest.TestSuite((
- DocFileSuite('README.txt',
- setUp=testing.setUp, tearDown=testing.tearDown,
- optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS,
- ),
- ))
-
-
-if __name__ == '__main__':
- unittest.main(defaultTest='test_suite')
+ return doctest.DocFileSuite(
+ 'README.txt',
+ setUp=testing.setUp, tearDown=testing.tearDown,
+ optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS)
Modified: z3c.widget/trunk/src/z3c/widget/dropdowndatewidget/tests.py
===================================================================
--- z3c.widget/trunk/src/z3c/widget/dropdowndatewidget/tests.py 2010-11-11 07:10:06 UTC (rev 118334)
+++ z3c.widget/trunk/src/z3c/widget/dropdowndatewidget/tests.py 2010-11-11 07:50:38 UTC (rev 118335)
@@ -1,15 +1,7 @@
-import unittest
+import doctest
-from zope.testing import doctest
-from zope.testing.doctestunit import DocFileSuite
-
def test_suite():
- return unittest.TestSuite((
- DocFileSuite('README.txt',
- optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS,
- ),
- ))
-
-if __name__ == '__main__':
- unittest.main(defaultTest='test_suite')
+ return doctest.DocFileSuite(
+ 'README.txt',
+ optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS)
Modified: z3c.widget/trunk/src/z3c/widget/flashupload/README.txt
===================================================================
--- z3c.widget/trunk/src/z3c/widget/flashupload/README.txt 2010-11-11 07:10:06 UTC (rev 118334)
+++ z3c.widget/trunk/src/z3c/widget/flashupload/README.txt 2010-11-11 07:50:38 UTC (rev 118335)
@@ -5,7 +5,6 @@
the flashupload vars page configures the flash frontend
>>> from z3c.widget.flashupload import upload
- >>> from zope.testing.doctestunit import DocTestSuite
>>> from zope.publisher.browser import TestRequest
>>> from zope.app.pagetemplate import ViewPageTemplateFile
>>> from zope.app.pagetemplate.simpleviewclass import SimpleViewClass
Modified: z3c.widget/trunk/src/z3c/widget/flashupload/tests.py
===================================================================
--- z3c.widget/trunk/src/z3c/widget/flashupload/tests.py 2010-11-11 07:10:06 UTC (rev 118334)
+++ z3c.widget/trunk/src/z3c/widget/flashupload/tests.py 2010-11-11 07:50:38 UTC (rev 118335)
@@ -1,29 +1,26 @@
import doctest
import unittest
-from zope.testing.doctestunit import DocTestSuite, DocFileSuite
from zope.app.testing import setup
+
def setUp(test):
setup.placefulSetUp()
+
def tearDown(test):
setup.placefulTearDown()
-def test_suite():
- return unittest.TestSuite(
- (
- DocTestSuite('z3c.widget.flashupload.ticket',
- setUp=setUp,tearDown=tearDown,
- optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS,
- ),
- DocFileSuite('README.txt',
- setUp=setUp,tearDown=tearDown,
- optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS,
- ),
-
+def test_suite():
+ return unittest.TestSuite((
+ doctest.DocTestSuite(
+ 'z3c.widget.flashupload.ticket',
+ setUp=setUp,tearDown=tearDown,
+ optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS,
+ ),
+ doctest.DocFileSuite(
+ 'README.txt',
+ setUp=setUp,tearDown=tearDown,
+ optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS,
+ ),
))
-
-if __name__ == '__main__':
- unittest.main(defaultTest='test_suite')
-
Modified: z3c.widget/trunk/src/z3c/widget/image/tests.py
===================================================================
--- z3c.widget/trunk/src/z3c/widget/image/tests.py 2010-11-11 07:10:06 UTC (rev 118334)
+++ z3c.widget/trunk/src/z3c/widget/image/tests.py 2010-11-11 07:50:38 UTC (rev 118335)
@@ -1,23 +1,18 @@
+from zope.app.testing import setup
import doctest
import unittest
-from zope.testing.doctestunit import DocFileSuite
-from zope.app.testing import setup
+
def setUp(test):
setup.placefulSetUp(True)
+
def tearDown(test):
setup.placefulTearDown()
-def test_suite():
-
- return unittest.TestSuite(
- (
- DocFileSuite('README.txt',
- setUp=setUp,tearDown=tearDown,
- optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS,
- ),
- ))
-if __name__ == '__main__':
- unittest.main(defaultTest='test_suite')
+def test_suite():
+ return doctest.DocFileSuite(
+ 'README.txt',
+ setUp=setUp,tearDown=tearDown,
+ optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS)
Modified: z3c.widget/trunk/src/z3c/widget/namespace/README.txt
===================================================================
--- z3c.widget/trunk/src/z3c/widget/namespace/README.txt 2010-11-11 07:10:06 UTC (rev 118334)
+++ z3c.widget/trunk/src/z3c/widget/namespace/README.txt 2010-11-11 07:50:38 UTC (rev 118335)
@@ -24,5 +24,5 @@
>>> view = MyForm(content,request)
>>> handler = WidgetHandler(view,request)
>>> handler.traverse('title',None)
- <zope.app.form.browser.textwidgets.TextWidget object at ...>
+ <zope.formlib.textwidgets.TextWidget object at ...>
Modified: z3c.widget/trunk/src/z3c/widget/namespace/tests.py
===================================================================
--- z3c.widget/trunk/src/z3c/widget/namespace/tests.py 2010-11-11 07:10:06 UTC (rev 118334)
+++ z3c.widget/trunk/src/z3c/widget/namespace/tests.py 2010-11-11 07:50:38 UTC (rev 118335)
@@ -1,32 +1,26 @@
-import doctest
-import unittest
-from zope.testing.doctestunit import DocFileSuite
-from zope.app.testing import setup
from zope import component
-from zope.app.form.interfaces import IInputWidget
-from zope.schema.interfaces import ITextLine
from zope.app.form.browser import TextWidget
+from zope.app.form.interfaces import IInputWidget
+from zope.app.testing import setup
from zope.publisher.interfaces.browser import IBrowserRequest
+from zope.schema.interfaces import ITextLine
+import doctest
+import unittest
+
def setUp(test):
setup.placefulSetUp()
#factory, adapts=None, provides=None, name=''
component.provideAdapter(TextWidget,(ITextLine,IBrowserRequest),
IInputWidget)
-
+
def tearDown(test):
setup.placefulTearDown()
-def test_suite():
-
- return unittest.TestSuite(
- (
- DocFileSuite('README.txt',
- setUp=setUp,tearDown=tearDown,
- optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS,
- ),
- ))
-if __name__ == '__main__':
- unittest.main(defaultTest='test_suite')
+def test_suite():
+ return doctest.DocFileSuite(
+ 'README.txt',
+ setUp=setUp,tearDown=tearDown,
+ optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS)
Modified: z3c.widget/trunk/src/z3c/widget/optdropdown/README.txt
===================================================================
--- z3c.widget/trunk/src/z3c/widget/optdropdown/README.txt 2010-11-11 07:10:06 UTC (rev 118334)
+++ z3c.widget/trunk/src/z3c/widget/optdropdown/README.txt 2010-11-11 07:50:38 UTC (rev 118335)
@@ -62,9 +62,9 @@
The constructor should have also created 2 widgets:
>>> widget.customWidget
- <zope.app.form.browser.textwidgets.TextWidget object at ...>
+ <zope.formlib.textwidgets.TextWidget object at ...>
>>> widget.dropdownWidget
- <zope.app.form.browser.itemswidgets.DropdownWidget object at ...>
+ <zope.formlib.itemswidgets.DropdownWidget object at ...>
``setRenderedValue(value)`` Method
@@ -295,7 +295,7 @@
>>> widget.getInputValue()
Traceback (most recent call last):
...
- ConversionError: ('Invalid value', token u'Waitress' not found in vocabulary)
+ ConversionError: (u'Invalid value', InvalidValue("token u'Waitress' not found in vocabulary"))
>>> widget.error()
u'<span class="error">Invalid value</span>'
@@ -316,7 +316,7 @@
>>> widget.getInputValue()
Traceback (most recent call last):
...
- WidgetInputError: ('custom', u'', Teacher Bad Stuff)
+ WidgetInputError: ('custom', u'', ConstraintNotSatisfied(u'Teacher\nBad Stuff'))
>>> widget.error()
u'<span class="error">Constraint not satisfied</span>'
@@ -339,7 +339,7 @@
<div class="value">
<select id="field.occupation.occupation"
name="field.occupation.occupation" size="1" >
- <option selected="selected" value="">(no value)</option>
+ <option selected="selected" value="">(nothing selected)</option>
<option value="Programmer">Programmer</option>
<option value="Designer">Designer</option>
<option value="Project Manager">Project Manager</option>
Modified: z3c.widget/trunk/src/z3c/widget/optdropdown/tests.py
===================================================================
--- z3c.widget/trunk/src/z3c/widget/optdropdown/tests.py 2010-11-11 07:10:06 UTC (rev 118334)
+++ z3c.widget/trunk/src/z3c/widget/optdropdown/tests.py 2010-11-11 07:50:38 UTC (rev 118335)
@@ -11,25 +11,17 @@
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
-"""Optional Dropdown Widget Tests
+"""Optional Dropdown Widget Tests."""
-$Id$
-"""
-__docformat__ = "reStructuredText"
+from pprint import pprint
+from zope.app.testing import placelesssetup
import doctest
import unittest
-from zope.testing import doctestunit
-from zope.app.testing import placelesssetup
-def test_suite():
- return unittest.TestSuite((
- doctestunit.DocFileSuite(
- 'README.txt',
- setUp=placelesssetup.setUp, tearDown=placelesssetup.tearDown,
- globs={'pprint': doctestunit.pprint},
- optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS),
- ))
-if __name__ == '__main__':
- unittest.main(defaultTest='test_suite')
-
+def test_suite():
+ return doctest.DocFileSuite(
+ 'README.txt',
+ setUp=placelesssetup.setUp, tearDown=placelesssetup.tearDown,
+ globs={'pprint': pprint},
+ optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS)
Modified: z3c.widget/trunk/src/z3c/widget/sequence/tests.py
===================================================================
--- z3c.widget/trunk/src/z3c/widget/sequence/tests.py 2010-11-11 07:10:06 UTC (rev 118334)
+++ z3c.widget/trunk/src/z3c/widget/sequence/tests.py 2010-11-11 07:50:38 UTC (rev 118335)
@@ -16,7 +16,7 @@
$Id$
"""
import unittest
-from zope.testing import doctest
+import doctest
from zope.schema import Tuple, List, TextLine, Object
from zope.schema.interfaces import ITextLine
from zope.publisher.browser import TestRequest
@@ -67,7 +67,7 @@
def _FieldFactory(self, **kw):
kw.update({
- '__name__': u'foo',
+ '__name__': u'foo',
'value_type': Object(__name__=u'bar',
schema=IFoo)})
return Tuple(**kw)
@@ -354,7 +354,7 @@
class SequenceDisplayWidgetTest(
VerifyResults, SequenceWidgetTestHelper, unittest.TestCase):
-
+
def _WidgetFactory(self, *args, **kw):
w = SequenceDisplayTableWidget(*args, **kw)
w.cssClass = "testwidget"
@@ -436,6 +436,3 @@
|doctest.REPORT_NDIFF),
unittest.makeSuite(SequenceDisplayWidgetTest),
))
-
-if __name__=='__main__':
- unittest.main(defaultTest='test_suite')
Modified: z3c.widget/trunk/src/z3c/widget/sequence/widget.py
===================================================================
--- z3c.widget/trunk/src/z3c/widget/sequence/widget.py 2010-11-11 07:10:06 UTC (rev 118334)
+++ z3c.widget/trunk/src/z3c/widget/sequence/widget.py 2010-11-11 07:50:38 UTC (rev 118335)
@@ -1,37 +1,37 @@
# -*- coding: utf-8 -*-
-
-from zope.i18n import translate
-from zope.app import zapi
+from zope.app.form.browser import SequenceDisplayWidget, SequenceWidget
from zope.app.form.interfaces import IInputWidget
-
-from zope.app.form.browser import SequenceDisplayWidget, SequenceWidget
from zope.app.pagetemplate.viewpagetemplatefile import ViewPageTemplateFile
+from zope.i18n import translate
+import zope.component
+
try:
from zc import resourcelibrary
haveResourceLibrary = True
except ImportError:
haveResourceLibrary = False
+
def _getSubWidget(sequenceWidget, prefix="%s."):
field = sequenceWidget.context.value_type
if sequenceWidget.subwidget is not None:
widget = sequenceWidget.subwidget(field, sequenceWidget.request)
else:
- widget = zapi.getMultiAdapter((field, sequenceWidget.request),
- IInputWidget)
+ widget = zope.component.getMultiAdapter((field, sequenceWidget.request),
+ IInputWidget)
widget.setPrefix(prefix % (sequenceWidget.name))
return widget
class SequenceDisplayTableWidget(SequenceDisplayWidget):
template = ViewPageTemplateFile('sequencedisplaytablewidget.pt')
-
+
def __call__(self):
return self.template()
-
+
def mainWidget(self):
return _getSubWidget(self)
-
+
def haveMessage(self):
if self._renderedValueSet():
data = self._data
@@ -45,7 +45,7 @@
if not data:
return translate(self._emptySequenceMessage, self.request)
return None
-
+
def widgets(self):
# get the data to display:
if self._renderedValueSet():
@@ -70,7 +70,7 @@
class SequenceTableWidget(SequenceWidget):
template = ViewPageTemplateFile('sequencetablewidget.pt')
-
+
def mainWidget(self):
return _getSubWidget(self)
@@ -85,15 +85,15 @@
class SequenceTableJSWidget(SequenceWidget):
template = ViewPageTemplateFile('sequencetablejswidget.pt')
haveResourceLibrary = haveResourceLibrary
-
+
def mainWidget(self):
return _getSubWidget(self)
-
+
def emptyWidget(self):
widget = _getSubWidget(self, prefix="%s._default_rowid_")
widget.setRenderedValue(None)
return widget
-
+
def _getPresenceMarker(self, count=0):
maxval = self.context.max_length
if maxval:
@@ -112,11 +112,11 @@
rv = rv+('<input type="hidden" name="%s.min_length" id="%s.min_length" value="%s" />'
% (self.name, self.name, minval))
return rv
-
+
def __call__(self, *args, **kw):
if haveResourceLibrary:
resourcelibrary.need('sequencetable')
- return super(SequenceTableJSWidget, self).__call__(*args, **kw)
+ return super(SequenceTableJSWidget, self).__call__(*args, **kw)
class TupleSequenceTableJSWidget(SequenceTableJSWidget):
_type = tuple
Modified: z3c.widget/trunk/src/z3c/widget/ssn/README.txt
===================================================================
--- z3c.widget/trunk/src/z3c/widget/ssn/README.txt 2010-11-11 07:10:06 UTC (rev 118334)
+++ z3c.widget/trunk/src/z3c/widget/ssn/README.txt 2010-11-11 07:50:38 UTC (rev 118335)
@@ -44,11 +44,11 @@
The constructor should have also created 3 sub-widgets:
>>> widget.widgets['first']
- <zope.app.form.browser.textwidgets.TextWidget object at ...>
+ <zope.formlib.textwidgets.TextWidget object at ...>
>>> widget.widgets['second']
- <zope.app.form.browser.textwidgets.TextWidget object at ...>
+ <zope.formlib.textwidgets.TextWidget object at ...>
>>> widget.widgets['third']
- <zope.app.form.browser.textwidgets.TextWidget object at ...>
+ <zope.formlib.textwidgets.TextWidget object at ...>
``setRenderedValue(value)`` Method
@@ -135,10 +135,10 @@
>>> widget.getInputValue()
Traceback (most recent call last):
...
- WidgetInputError: ('first', u'Frst three digits', 1234)
+ WidgetInputError: ('first', u'Frst three digits', ConstraintNotSatisfied(u'1234'))
- >>> widget._error
- <zope.app.form.interfaces.WidgetInputError ...>
+ >>> widget._error.__class__
+ <class 'zope.formlib.interfaces.WidgetInputError'>
``applyChanges(content)`` Method
@@ -275,7 +275,7 @@
>>> widget.getInputValue()
Traceback (most recent call last):
...
- WidgetInputError: ('third', u'Third four digits', 678)
+ WidgetInputError: ('third', u'Third four digits', ConstraintNotSatisfied(u'678'))
>>> print widget.error()
<span class="error">Constraint not satisfied</span>
@@ -289,7 +289,7 @@
>>> widget.getInputValue()
Traceback (most recent call last):
...
- WidgetInputError: ('second', u'Second two digits', 4-)
+ WidgetInputError: ('second', u'Second two digits', ConstraintNotSatisfied(u'4-'))
>>> print widget.error()
<span class="error">Constraint not satisfied</span>
@@ -303,7 +303,7 @@
>>> widget.getInputValue()
Traceback (most recent call last):
...
- WidgetInputError: ('first', u'Frst three digits', xxx)
+ WidgetInputError: ('first', u'Frst three digits', ConstraintNotSatisfied(u'xxx'))
>>> print widget.error()
<span class="error">Constraint not satisfied</span>
Modified: z3c.widget/trunk/src/z3c/widget/ssn/browser.py
===================================================================
--- z3c.widget/trunk/src/z3c/widget/ssn/browser.py 2010-11-11 07:10:06 UTC (rev 118334)
+++ z3c.widget/trunk/src/z3c/widget/ssn/browser.py 2010-11-11 07:50:38 UTC (rev 118335)
@@ -11,27 +11,23 @@
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
-"""
-$Id$
-"""
__docformat__ = 'reStructuredText'
+from z3c.i18n import MessageFactory as _
+from zope.app.form import browser
+from zope.app.form.browser.interfaces import IBrowserWidget
+from zope.app.form.browser.interfaces import IWidgetInputErrorView
+from zope.app.form.interfaces import IInputWidget
+from zope.app.form.interfaces import WidgetInputError
+from zope.app.pagetemplate import ViewPageTemplateFile
+from zope.formlib import form
import datetime
import re
+import zope.component
import zope.interface
import zope.schema
-from zope.formlib import form
-from zope.app.form.interfaces import IInputWidget
-from zope.app.form.interfaces import WidgetInputError
-from zope.app.form.browser.interfaces import IBrowserWidget
-from zope.app.form import browser
-from zope.app.pagetemplate import ViewPageTemplateFile
-from zope.app.zapi import getMultiAdapter
-from zope.app.form.browser.interfaces import IWidgetInputErrorView
-from z3c.i18n import MessageFactory as _
-
class ISSNData(zope.interface.Interface):
"""A schema used to generate a SSN widget."""
@@ -187,8 +183,9 @@
def error(self):
"""See zope.app.form.browser.interfaces.IBrowserWidget"""
if self._error:
- return getMultiAdapter((self._error, self.request),
- IWidgetInputErrorView).snippet()
+ return zope.component.getMultiAdapter(
+ (self._error, self.request),
+ IWidgetInputErrorView).snippet()
first_error = self.widgets['first'].error()
if first_error:
return first_error
Modified: z3c.widget/trunk/src/z3c/widget/ssn/tests.py
===================================================================
--- z3c.widget/trunk/src/z3c/widget/ssn/tests.py 2010-11-11 07:10:06 UTC (rev 118334)
+++ z3c.widget/trunk/src/z3c/widget/ssn/tests.py 2010-11-11 07:50:38 UTC (rev 118335)
@@ -11,27 +11,12 @@
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
-"""
-$Id$
-"""
-__docformat__ = "reStructuredText"
-
+from z3c.widget.ssn import testing
import doctest
-import unittest
-import zope.schema
-from zope.testing.doctestunit import DocFileSuite
-from z3c.widget.ssn import testing
-
def test_suite():
- return unittest.TestSuite((
- DocFileSuite('README.txt',
- setUp=testing.setUp, tearDown=testing.tearDown,
- optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS,
- ),
- ))
-
-
-if __name__ == '__main__':
- unittest.main(defaultTest='test_suite')
+ return doctest.DocFileSuite(
+ 'README.txt',
+ setUp=testing.setUp, tearDown=testing.tearDown,
+ optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS)
Modified: z3c.widget/trunk/src/z3c/widget/tiny/tests.py
===================================================================
--- z3c.widget/trunk/src/z3c/widget/tiny/tests.py 2010-11-11 07:10:06 UTC (rev 118334)
+++ z3c.widget/trunk/src/z3c/widget/tiny/tests.py 2010-11-11 07:50:38 UTC (rev 118335)
@@ -11,33 +11,21 @@
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
-"""HTML-Editor Widget unittests
+"""HTML-Editor Widget unittests."""
-$Id$
-"""
-__docformat__ = "reStructuredText"
-
+from zope.app.testing import setup
import doctest
-import unittest
-from zope.testing.doctestunit import DocTestSuite
-from zope.app.testing import setup
-
def setUp(test):
setup.placefulSetUp()
+
def tearDown(test):
setup.placefulTearDown()
def test_suite():
- return unittest.TestSuite(
- (
- DocTestSuite('z3c.widget.tiny.widget',
- optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS,
- ),
- ))
-
-if __name__ == '__main__':
- unittest.main(defaultTest='test_suite')
+ return doctest.DocTestSuite(
+ 'z3c.widget.tiny.widget',
+ optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS)
Modified: z3c.widget/trunk/src/z3c/widget/usphone/README.txt
===================================================================
--- z3c.widget/trunk/src/z3c/widget/usphone/README.txt 2010-11-11 07:10:06 UTC (rev 118334)
+++ z3c.widget/trunk/src/z3c/widget/usphone/README.txt 2010-11-11 07:50:38 UTC (rev 118335)
@@ -44,11 +44,11 @@
The constructor should have also created 3 sub-widgets:
>>> widget.widgets['first']
- <zope.app.form.browser.textwidgets.TextWidget object at ...>
+ <zope.formlib.textwidgets.TextWidget object at ...>
>>> widget.widgets['second']
- <zope.app.form.browser.textwidgets.TextWidget object at ...>
+ <zope.formlib.textwidgets.TextWidget object at ...>
>>> widget.widgets['third']
- <zope.app.form.browser.textwidgets.TextWidget object at ...>
+ <zope.formlib.textwidgets.TextWidget object at ...>
``setRenderedValue(value)`` Method
@@ -135,10 +135,10 @@
>>> widget.getInputValue()
Traceback (most recent call last):
...
- WidgetInputError: ('first', u'Area Code', 1234)
+ WidgetInputError: ('first', u'Area Code', ConstraintNotSatisfied(u'1234'))
- >>> widget._error
- <zope.app.form.interfaces.WidgetInputError ...>
+ >>> widget._error.__class__
+ <class 'zope.formlib.interfaces.WidgetInputError'>
``applyChanges(content)`` Method
@@ -275,7 +275,7 @@
>>> widget.getInputValue()
Traceback (most recent call last):
...
- WidgetInputError: ('third', u'Four Digits', 78901)
+ WidgetInputError: ('third', u'Four Digits', ConstraintNotSatisfied(u'78901'))
>>> print widget.error()
<span class="error">Constraint not satisfied</span>
@@ -290,7 +290,7 @@
>>> widget.getInputValue()
Traceback (most recent call last):
...
- WidgetInputError: ('second', u'Three Digits', 45-)
+ WidgetInputError: ('second', u'Three Digits', ConstraintNotSatisfied(u'45-'))
>>> print widget.error()
<span class="error">Constraint not satisfied</span>
@@ -305,7 +305,7 @@
>>> widget.getInputValue()
Traceback (most recent call last):
...
- WidgetInputError: ('first', u'Area Code', xxx)
+ WidgetInputError: ('first', u'Area Code', ConstraintNotSatisfied(u'xxx'))
>>> print widget.error()
<span class="error">Constraint not satisfied</span>
Modified: z3c.widget/trunk/src/z3c/widget/usphone/browser.py
===================================================================
--- z3c.widget/trunk/src/z3c/widget/usphone/browser.py 2010-11-11 07:10:06 UTC (rev 118334)
+++ z3c.widget/trunk/src/z3c/widget/usphone/browser.py 2010-11-11 07:50:38 UTC (rev 118335)
@@ -11,27 +11,21 @@
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
-"""
-$Id$
-"""
-__docformat__ = 'reStructuredText'
-
+from z3c.i18n import MessageFactory as _
+from zope.app.form import browser
+from zope.app.form.browser.interfaces import IBrowserWidget
+from zope.app.form.browser.interfaces import IWidgetInputErrorView
+from zope.app.form.interfaces import IInputWidget
+from zope.app.form.interfaces import WidgetInputError
+from zope.app.pagetemplate import ViewPageTemplateFile
+from zope.formlib import form
import datetime
import re
+import zope.component
import zope.interface
import zope.schema
-from zope.formlib import form
-from zope.app.form.interfaces import IInputWidget
-from zope.app.form.interfaces import WidgetInputError
-from zope.app.form.browser.interfaces import IBrowserWidget
-from zope.app.form import browser
-from zope.app.pagetemplate import ViewPageTemplateFile
-from zope.app.zapi import getMultiAdapter
-from zope.app.form.browser.interfaces import IWidgetInputErrorView
-from z3c.i18n import MessageFactory as _
-
class IPhoneData(zope.interface.Interface):
"""A schema used to generate a Phone widget."""
@@ -187,8 +181,9 @@
def error(self):
"""See zope.app.form.browser.interfaces.IBrowserWidget"""
if self._error:
- return getMultiAdapter((self._error, self.request),
- IWidgetInputErrorView).snippet()
+ return zope.component.getMultiAdapter(
+ (self._error, self.request),
+ IWidgetInputErrorView).snippet()
first_error = self.widgets['first'].error()
if first_error:
return first_error
Modified: z3c.widget/trunk/src/z3c/widget/usphone/tests.py
===================================================================
--- z3c.widget/trunk/src/z3c/widget/usphone/tests.py 2010-11-11 07:10:06 UTC (rev 118334)
+++ z3c.widget/trunk/src/z3c/widget/usphone/tests.py 2010-11-11 07:50:38 UTC (rev 118335)
@@ -11,27 +11,12 @@
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
-"""
-$Id$
-"""
-__docformat__ = "reStructuredText"
-
+from z3c.widget.usphone import testing
import doctest
-import unittest
-import zope.schema
-from zope.testing.doctestunit import DocFileSuite
-from z3c.widget.usphone import testing
-
def test_suite():
- return unittest.TestSuite((
- DocFileSuite('README.txt',
- setUp=testing.setUp, tearDown=testing.tearDown,
- optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS,
- ),
- ))
-
-
-if __name__ == '__main__':
- unittest.main(defaultTest='test_suite')
+ return doctest.DocFileSuite(
+ 'README.txt',
+ setUp=testing.setUp, tearDown=testing.tearDown,
+ optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS)
More information about the checkins
mailing list