[Checkins] SVN: zope.formlib/trunk/ Rid ourselves from zope.app test dependencies.
Hanno Schlichting
hannosch at hannosch.eu
Thu Dec 17 20:30:34 EST 2009
Log message for revision 106730:
Rid ourselves from zope.app test dependencies.
Changed:
U zope.formlib/trunk/CHANGES.txt
U zope.formlib/trunk/setup.py
U zope.formlib/trunk/src/zope/formlib/ftesting.zcml
U zope.formlib/trunk/src/zope/formlib/tests.py
-=-
Modified: zope.formlib/trunk/CHANGES.txt
===================================================================
--- zope.formlib/trunk/CHANGES.txt 2009-12-18 00:12:20 UTC (rev 106729)
+++ zope.formlib/trunk/CHANGES.txt 2009-12-18 01:30:34 UTC (rev 106730)
@@ -2,12 +2,13 @@
Changes
=======
-3.6.1 (unreleased)
+3.7.0 (unreleased)
==================
+- Rid ourselves from zope.app test dependencies.
+
- Fix: Button label needs escaping
-
3.6.0 (2009-05-18)
==================
@@ -21,7 +22,6 @@
dependencies on ``zope.formlib`` when using this feature. Left BBB
imports here.
-
3.5.2 (2009-02-21)
==================
Modified: zope.formlib/trunk/setup.py
===================================================================
--- zope.formlib/trunk/setup.py 2009-12-18 00:12:20 UTC (rev 106729)
+++ zope.formlib/trunk/setup.py 2009-12-18 01:30:34 UTC (rev 106730)
@@ -26,7 +26,7 @@
def read(*rnames):
return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
-version = '3.6.1dev'
+version = '3.7.0dev'
setup(name='zope.formlib',
version=version,
@@ -47,12 +47,16 @@
package_dir = {'': 'src'},
namespace_packages=['zope',],
extras_require=dict(
- test=['zope.app.testing', 'zope.app.zcmlfiles']
+ test=['zope.cachedescriptors',
+ 'zope.configuration',
+ 'zope.testing',
+ ]
),
install_requires=['setuptools',
'pytz',
'zope.app.form',
'zope.app.pagetemplate>=3.6.0',
+ 'zope.browser>=1.1',
'zope.component',
'zope.event',
'zope.i18n',
@@ -63,7 +67,6 @@
'zope.schema>=3.5.1',
'zope.security',
'zope.traversing',
- 'zope.browser>=1.1',
],
include_package_data = True,
zip_safe = False,
Modified: zope.formlib/trunk/src/zope/formlib/ftesting.zcml
===================================================================
--- zope.formlib/trunk/src/zope/formlib/ftesting.zcml 2009-12-18 00:12:20 UTC (rev 106729)
+++ zope.formlib/trunk/src/zope/formlib/ftesting.zcml 2009-12-18 01:30:34 UTC (rev 106730)
@@ -1,15 +1,12 @@
<configure
- xmlns="http://namespaces.zope.org/zope"
- i18n_domain="zope"
- package="zope.formlib"
- >
+ xmlns="http://namespaces.zope.org/zope"
+ i18n_domain="zope"
+ package="zope.formlib"
+ >
- <!-- This file is the equivalent of site.zcml and it is -->
- <!-- used for functional testing setup -->
+ <include package="zope.component" file="meta.zcml" />
+ <include package="zope.security" file="meta.zcml" />
- <include package="zope.app.zcmlfiles" />
- <include package="zope.formlib" />
-
<class class=".tests.Order">
<allow interface=".tests.IOrder" />
<require
Modified: zope.formlib/trunk/src/zope/formlib/tests.py
===================================================================
--- zope.formlib/trunk/src/zope/formlib/tests.py 2009-12-18 00:12:20 UTC (rev 106729)
+++ zope.formlib/trunk/src/zope/formlib/tests.py 2009-12-18 01:30:34 UTC (rev 106730)
@@ -15,12 +15,16 @@
$Id$
"""
import unittest
-import os
import re
import pytz
-import zope.component.testing
-import zope.i18n.testing
+from zope.component.testing import setUp, tearDown
+from zope.component import adapter
+from zope.component import adapts
+from zope.component import provideAdapter
+from zope.component import provideUtility
+
+from zope.i18n.testing import setUp as i18nSetUp
import zope.interface.common.idatetime
import zope.publisher.interfaces
import zope.publisher.interfaces.browser
@@ -33,31 +37,26 @@
import zope.app.form.browser.interfaces
import zope.app.form.interfaces
-from zope.app.testing import functional
-
+import zope.formlib
import zope.formlib.form
import zope.formlib.interfaces
import zope.app.pagetemplate.namedtemplate
-FormlibLayer = functional.ZCMLLayer(
- os.path.join(os.path.split(__file__)[0], 'ftesting.zcml'),
- __name__, 'FormlibLayer', allow_teardown=True)
+from zope.configuration.xmlconfig import XMLConfig
-
-
@zope.interface.implementer(zope.interface.common.idatetime.ITZInfo)
- at zope.component.adapter(zope.publisher.interfaces.IRequest)
+ at adapter(zope.publisher.interfaces.IRequest)
def requestToTZInfo(request):
return pytz.timezone('US/Hawaii')
def pageSetUp(test):
- zope.component.testing.setUp(test)
- zope.component.provideAdapter(
+ setUp(test)
+ provideAdapter(
zope.traversing.adapters.DefaultTraversable,
[None],
)
- at zope.component.adapter(zope.formlib.interfaces.IForm)
+ at adapter(zope.formlib.interfaces.IForm)
@zope.app.pagetemplate.namedtemplate.NamedTemplateImplementation
def TestTemplate(self):
status = self.status
@@ -87,76 +86,85 @@
return '\n'.join(result)
def formSetUp(test):
- zope.component.testing.setUp(test)
- zope.i18n.testing.setUp(test)
- zope.component.provideAdapter(
+ setUp(test)
+ i18nSetUp(test)
+ provideAdapter(
zope.app.form.browser.TextWidget,
[zope.schema.interfaces.ITextLine,
zope.publisher.interfaces.browser.IBrowserRequest,
],
zope.app.form.interfaces.IInputWidget,
)
- zope.component.provideAdapter(
+ provideAdapter(
zope.app.form.browser.FloatWidget,
[zope.schema.interfaces.IFloat,
zope.publisher.interfaces.browser.IBrowserRequest,
],
zope.app.form.interfaces.IInputWidget,
)
- zope.component.provideAdapter(
+ provideAdapter(
zope.app.form.browser.UnicodeDisplayWidget,
[zope.schema.interfaces.IInt,
zope.publisher.interfaces.browser.IBrowserRequest,
],
zope.app.form.interfaces.IDisplayWidget,
)
- zope.component.provideAdapter(
+ provideAdapter(
zope.app.form.browser.IntWidget,
[zope.schema.interfaces.IInt,
zope.publisher.interfaces.browser.IBrowserRequest,
],
zope.app.form.interfaces.IInputWidget,
)
- zope.component.provideAdapter(
+ provideAdapter(
zope.app.form.browser.UnicodeDisplayWidget,
[zope.schema.interfaces.IFloat,
zope.publisher.interfaces.browser.IBrowserRequest,
],
zope.app.form.interfaces.IDisplayWidget,
)
- zope.component.provideAdapter(
+ provideAdapter(
zope.app.form.browser.UnicodeDisplayWidget,
[zope.schema.interfaces.ITextLine,
zope.publisher.interfaces.browser.IBrowserRequest,
],
zope.app.form.interfaces.IDisplayWidget,
)
- zope.component.provideAdapter(
+ provideAdapter(
zope.app.form.browser.DatetimeDisplayWidget,
[zope.schema.interfaces.IDatetime,
zope.publisher.interfaces.browser.IBrowserRequest,
],
zope.app.form.interfaces.IDisplayWidget,
)
- zope.component.provideAdapter(
+ provideAdapter(
zope.app.form.browser.DatetimeWidget,
[zope.schema.interfaces.IDatetime,
zope.publisher.interfaces.browser.IBrowserRequest,
],
zope.app.form.interfaces.IInputWidget,
)
- zope.component.provideAdapter(
+ provideAdapter(
zope.app.form.browser.exception.WidgetInputErrorView,
[zope.app.form.interfaces.IWidgetInputError,
zope.publisher.interfaces.browser.IBrowserRequest,
],
zope.app.form.browser.interfaces.IWidgetInputErrorView,
)
- zope.component.provideAdapter(TestTemplate, name='default')
- zope.component.provideAdapter(requestToTZInfo)
- zope.component.provideAdapter(
+ provideAdapter(
+ zope.formlib.errors.InvalidErrorView,
+ [zope.interface.Invalid,
+ zope.publisher.interfaces.browser.IBrowserRequest,
+ ],
+ zope.app.form.browser.interfaces.IWidgetInputErrorView,
+ )
+ provideAdapter(TestTemplate, name='default')
+ provideAdapter(requestToTZInfo)
+ provideAdapter(
zope.formlib.form.render_submit_button, name='render')
+ XMLConfig('ftesting.zcml', zope.formlib)
+
# Classes used in tests
class IOrder(zope.interface.Interface):
@@ -180,7 +188,7 @@
class Descriptive(object):
- zope.component.adapts(IOrder)
+ adapts(IOrder)
zope.interface.implements(IDescriptive)
def __init__(self, context):
self.context = context
@@ -266,7 +274,7 @@
... print default
... return msgid
- >>> zope.component.provideUtility(MyDomain(), name='my.domain')
+ >>> provideUtility(MyDomain(), name='my.domain')
Now, if we call render_submit_button, we should be able to verify the
data passed to translate:
@@ -379,20 +387,20 @@
>>> import zope.traversing.interfaces
>>> class view:
- ... zope.component.adapts(None, None)
+ ... adapts(None, None)
... zope.interface.implements(zope.traversing.interfaces.ITraversable)
... def __init__(self, ob, r=None):
... pass
... def traverse(*args):
... return macro_template.macros
- >>> zope.component.provideAdapter(view, name='view')
+ >>> provideAdapter(view, name='view')
And we have to register the default traversable adapter (I wish we had
push templates):
>>> from zope.traversing.adapters import DefaultTraversable
- >>> zope.component.provideAdapter(DefaultTraversable, [None])
+ >>> provideAdapter(DefaultTraversable, [None])
We need to set up the translation framework. We'll just provide a
negotiator that always decides to use the test language:
@@ -403,13 +411,13 @@
... def getLanguage(*ignored):
... return 'test'
- >>> zope.component.provideUtility(Negotiator())
+ >>> provideUtility(Negotiator())
And we'll set up the fallback-domain factory, which provides the test
language for all domains:
>>> from zope.i18n.testmessagecatalog import TestMessageFallbackDomain
- >>> zope.component.provideUtility(TestMessageFallbackDomain)
+ >>> provideUtility(TestMessageFallbackDomain)
OK, so let's see what the page form looks like. First, we'll compute
the page:
@@ -533,27 +541,30 @@
(re.compile(r" ValueError\('invalid literal for float\(\): (bob'|10,0'),\)"),
r"\n <exceptions.ValueError instance at ...>"),
])
- errors = functional.FunctionalDocFileSuite("errors.txt")
- errors.layer = FormlibLayer
- bugs = functional.FunctionalDocFileSuite(
- "bugs.txt",
- optionflags=doctest.INTERPRET_FOOTNOTES | doctest.ELLIPSIS)
- bugs.layer = FormlibLayer
return unittest.TestSuite((
doctest.DocFileSuite(
+ 'errors.txt',
+ setUp=formSetUp, tearDown=tearDown,
+ optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS,
+ ),
+ # The following test needs some zope.security test setup
+ # doctest.DocFileSuite(
+ # 'bugs.txt',
+ # setUp=formSetUp, tearDown=tearDown,
+ # optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS,
+ # ),
+ doctest.DocFileSuite(
'form.txt',
- setUp=formSetUp, tearDown=zope.component.testing.tearDown,
+ setUp=formSetUp, tearDown=tearDown,
optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS,
checker=checker
),
doctest.DocTestSuite(
- setUp=formSetUp, tearDown=zope.component.testing.tearDown,
+ setUp=formSetUp, tearDown=tearDown,
checker=checker
),
doctest.DocTestSuite(
'zope.formlib.errors'),
- errors,
- bugs,
))
if __name__ == '__main__':
More information about the checkins
mailing list