[Checkins] SVN: Products.CMFDefault/branches/2.2/ Backport test setup cleanup and five.formlib cleanup
Hanno Schlichting
hannosch at hannosch.eu
Sun Jun 6 11:26:29 EDT 2010
Log message for revision 113211:
Backport test setup cleanup and five.formlib cleanup
Changed:
U Products.CMFDefault/branches/2.2/Products/CMFDefault/CHANGES.txt
U Products.CMFDefault/branches/2.2/Products/CMFDefault/browser/folder.py
U Products.CMFDefault/branches/2.2/Products/CMFDefault/browser/tests/utils.py
U Products.CMFDefault/branches/2.2/Products/CMFDefault/configure.zcml
U Products.CMFDefault/branches/2.2/Products/CMFDefault/formlib/form.py
A Products.CMFDefault/branches/2.2/Products/CMFDefault/meta.zcml
U Products.CMFDefault/branches/2.2/Products/CMFDefault/tests/test_utils.py
U Products.CMFDefault/branches/2.2/setup.py
-=-
Modified: Products.CMFDefault/branches/2.2/Products/CMFDefault/CHANGES.txt
===================================================================
--- Products.CMFDefault/branches/2.2/Products/CMFDefault/CHANGES.txt 2010-06-06 15:09:46 UTC (rev 113210)
+++ Products.CMFDefault/branches/2.2/Products/CMFDefault/CHANGES.txt 2010-06-06 15:26:29 UTC (rev 113211)
@@ -4,6 +4,10 @@
2.2.1-beta (unreleased)
-----------------------
+- Require at least Zope 2.12.3 and always use the five.formlib extension.
+
+- Removed testing dependency on zope.app.testing.
+
- Deal with deprecation warnings for Zope 2.13.
- Use the standard libraries doctest module.
Modified: Products.CMFDefault/branches/2.2/Products/CMFDefault/browser/folder.py
===================================================================
--- Products.CMFDefault/branches/2.2/Products/CMFDefault/browser/folder.py 2010-06-06 15:09:46 UTC (rev 113210)
+++ Products.CMFDefault/branches/2.2/Products/CMFDefault/browser/folder.py 2010-06-06 15:26:29 UTC (rev 113211)
@@ -25,14 +25,10 @@
from zope.schema.vocabulary import SimpleTerm
from zope.schema.vocabulary import SimpleVocabulary
+from five.formlib.formbase import PageForm
from zope.formlib import form
from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile
-# BBB Zope 2.12
-try:
- from five.formlib.formbase import PageForm
-except ImportError:
- from Products.Five.formlib.formbase import PageForm
from Products.CMFCore.interfaces import IDynamicType
Modified: Products.CMFDefault/branches/2.2/Products/CMFDefault/browser/tests/utils.py
===================================================================
--- Products.CMFDefault/branches/2.2/Products/CMFDefault/browser/tests/utils.py 2010-06-06 15:09:46 UTC (rev 113210)
+++ Products.CMFDefault/branches/2.2/Products/CMFDefault/browser/tests/utils.py 2010-06-06 15:26:29 UTC (rev 113211)
@@ -15,7 +15,10 @@
$Id$
"""
-from Products.Five.schema import Zope2VocabularyRegistry
+try:
+ from Zope2.App.schema import Zope2VocabularyRegistry
+except ImportError: # Zope2 <= 2.12
+ from Products.Five.schema import Zope2VocabularyRegistry
def setupVocabulary(testcase):
Modified: Products.CMFDefault/branches/2.2/Products/CMFDefault/configure.zcml
===================================================================
--- Products.CMFDefault/branches/2.2/Products/CMFDefault/configure.zcml 2010-06-06 15:09:46 UTC (rev 113210)
+++ Products.CMFDefault/branches/2.2/Products/CMFDefault/configure.zcml 2010-06-06 15:26:29 UTC (rev 113211)
@@ -1,6 +1,8 @@
<configure
xmlns="http://namespaces.zope.org/zope">
+ <include package="five.formlib"/>
+
<include package=".skin"/>
<include package=".browser"/>
Modified: Products.CMFDefault/branches/2.2/Products/CMFDefault/formlib/form.py
===================================================================
--- Products.CMFDefault/branches/2.2/Products/CMFDefault/formlib/form.py 2010-06-06 15:09:46 UTC (rev 113210)
+++ Products.CMFDefault/branches/2.2/Products/CMFDefault/formlib/form.py 2010-06-06 15:26:29 UTC (rev 113211)
@@ -21,16 +21,10 @@
from AccessControl.SecurityInfo import ClassSecurityInfo
from App.class_init import InitializeClass
from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile
-# BBB Zope 2.12
-try:
- from five.formlib.formbase import PageAddForm
- from five.formlib.formbase import PageDisplayForm
- from five.formlib.formbase import PageForm
-except ImportError:
- from Products.Five.formlib.formbase import PageAddForm
- from Products.Five.formlib.formbase import PageDisplayForm
- from Products.Five.formlib.formbase import PageForm
+from five.formlib.formbase import PageAddForm
+from five.formlib.formbase import PageDisplayForm
+from five.formlib.formbase import PageForm
from zope.component import adapts
from zope.component import getUtility
from zope.component.interfaces import IFactory
Copied: Products.CMFDefault/branches/2.2/Products/CMFDefault/meta.zcml (from rev 113206, Products.CMFDefault/trunk/Products/CMFDefault/meta.zcml)
===================================================================
--- Products.CMFDefault/branches/2.2/Products/CMFDefault/meta.zcml (rev 0)
+++ Products.CMFDefault/branches/2.2/Products/CMFDefault/meta.zcml 2010-06-06 15:26:29 UTC (rev 113211)
@@ -0,0 +1,6 @@
+<configure
+ xmlns="http://namespaces.zope.org/zope">
+
+ <include package="five.formlib" file="meta.zcml" />
+
+</configure>
Modified: Products.CMFDefault/branches/2.2/Products/CMFDefault/tests/test_utils.py
===================================================================
--- Products.CMFDefault/branches/2.2/Products/CMFDefault/tests/test_utils.py 2010-06-06 15:09:46 UTC (rev 113210)
+++ Products.CMFDefault/branches/2.2/Products/CMFDefault/tests/test_utils.py 2010-06-06 15:26:29 UTC (rev 113211)
@@ -16,7 +16,6 @@
"""
import unittest
-import Testing
from Products.CMFCore.tests.base.content import FAUX_HTML_LEADING_TEXT
from Products.CMFCore.tests.base.content import SIMPLE_HTML
@@ -44,6 +43,14 @@
Header: value
'''
+ def setUp(self):
+ from zope.component.testing import setUp
+ setUp()
+
+ def tearDown(self):
+ from zope.component.testing import tearDown
+ tearDown()
+
def test_parseHeadersBody_no_body( self ):
from Products.CMFDefault.utils import parseHeadersBody
@@ -145,12 +152,12 @@
'<meta name="title" content="" /><meta />' )
def test_scrubHTML_with_adapter(self):
- from zope.interface import implements
from zope.component.testing import setUp
from zope.component.testing import tearDown
- from zope.app.testing import ztapi
from Products.CMFDefault.interfaces import IHTMLScrubber
from Products.CMFDefault.utils import scrubHTML
+ from zope.component import getSiteManager
+ from zope.interface import implements
class _Scrubber:
implements(IHTMLScrubber)
@@ -159,8 +166,10 @@
setUp()
+
+ sm = getSiteManager()
try:
- ztapi.provideUtility(IHTMLScrubber, _Scrubber())
+ sm.registerUtility(_Scrubber(), IHTMLScrubber)
self.assertEqual( scrubHTML('<a href="foo.html">bar</a>'),
'<A HREF="FOO.HTML">BAR</A>' )
self.assertEqual( scrubHTML('<b>bar</b>'),
Modified: Products.CMFDefault/branches/2.2/setup.py
===================================================================
--- Products.CMFDefault/branches/2.2/setup.py 2010-06-06 15:09:46 UTC (rev 113210)
+++ Products.CMFDefault/branches/2.2/setup.py 2010-06-06 15:26:29 UTC (rev 113211)
@@ -46,7 +46,8 @@
],
install_requires=[
'setuptools',
- 'Zope2 >= 2.12.0',
+ 'five.formlib >= 1.0.2',
+ 'Zope2 >= 2.12.3',
'Products.CMFCore',
'Products.GenericSetup',
],
More information about the checkins
mailing list