[Checkins] SVN: five.formlib/trunk/ Update various imports to zope.formlib and require at least Zope 2.13.
Hano Schlichting
cvs-admin at zope.org
Sat May 19 15:40:18 UTC 2012
Log message for revision 126386:
Update various imports to zope.formlib and require at least Zope 2.13.
Changed:
U five.formlib/trunk/CHANGES.txt
U five.formlib/trunk/setup.py
U five.formlib/trunk/src/five/formlib/__init__.py
U five.formlib/trunk/src/five/formlib/formbase.py
U five.formlib/trunk/src/five/formlib/metaconfigure.py
U five.formlib/trunk/src/five/formlib/objectwidget.py
U five.formlib/trunk/src/five/formlib/tests/configure.zcml
U five.formlib/trunk/src/five/formlib/tests/formlib.txt
U five.formlib/trunk/src/five/formlib/tests/forms.txt
U five.formlib/trunk/src/five/formlib/tests/schemacontent.py
U five.formlib/trunk/src/five/formlib/tests/test_formlib.py
-=-
Modified: five.formlib/trunk/CHANGES.txt
===================================================================
--- five.formlib/trunk/CHANGES.txt 2012-05-19 12:56:19 UTC (rev 126385)
+++ five.formlib/trunk/CHANGES.txt 2012-05-19 15:40:14 UTC (rev 126386)
@@ -1,11 +1,13 @@
Changelog
=========
-1.0.5 - unreleased
+1.1.0 - unreleased
------------------
-* Deal with forward compatibility with Zope 2.14.
+* Update various imports to zope.formlib and require at least Zope 2.13.
+* Deal with forward compatibility with Zope 4.
+
* Avoid charset negotiation.
1.0.4 - 2011-02-06
Modified: five.formlib/trunk/setup.py
===================================================================
--- five.formlib/trunk/setup.py 2012-05-19 12:56:19 UTC (rev 126385)
+++ five.formlib/trunk/setup.py 2012-05-19 15:40:14 UTC (rev 126386)
@@ -1,6 +1,6 @@
from setuptools import setup
-version = '1.0.5dev'
+version = '1.1.0dev'
setup(name='five.formlib',
version=version,
@@ -29,9 +29,10 @@
'transaction',
'zope.app.form',
'zope.browser',
+ 'zope.browsermenu',
'zope.component',
'zope.event',
- 'zope.formlib',
+ 'zope.formlib>=4.0',
'zope.i18nmessageid',
'zope.interface',
'zope.lifecycleevent',
@@ -39,10 +40,7 @@
'zope.publisher',
'zope.schema',
'ExtensionClass',
- 'Zope2',
- # Either one of these, we rely on Zope2 to provide the correct one
- # 'zope.browsermenu',
- # 'zope.app.publisher',
+ 'Zope2>=2.13',
],
zip_safe = False,
)
Modified: five.formlib/trunk/src/five/formlib/__init__.py
===================================================================
--- five.formlib/trunk/src/five/formlib/__init__.py 2012-05-19 12:56:19 UTC (rev 126385)
+++ five.formlib/trunk/src/five/formlib/__init__.py 2012-05-19 15:40:14 UTC (rev 126386)
@@ -20,24 +20,28 @@
import transaction
from zope.event import notify
+from zope.formlib.interfaces import IInputWidget
+from zope.formlib.interfaces import WidgetsError
+from zope.formlib.utility import applyWidgetsChanges
+from zope.formlib.utility import setUpWidgets
from zope.lifecycleevent import ObjectCreatedEvent, ObjectModifiedEvent
from zope.lifecycleevent import Attributes
from zope.location.interfaces import ILocation
from zope.location import LocationProxy
from zope.schema.interfaces import ValidationError
from zope.i18nmessageid import MessageFactory
-_ = MessageFactory('zope')
from zope.app.form.browser.submit import Update
-from zope.app.form.interfaces import IInputWidget
-from zope.app.form.interfaces import WidgetsError
-from zope.app.form.utility import setUpEditWidgets, applyWidgetsChanges
-from zope.app.form.utility import setUpWidgets, getWidgetsData
+from zope.app.form.utility import setUpEditWidgets
+from zope.app.form.utility import getWidgetsData
from Products.Five.browser import BrowserView
from Products.Five.browser.decode import processInputs, setPageEncoding
from Products.Five.browser.pagetemplatefile import ZopeTwoPageTemplateFile
+_ = MessageFactory('zope')
+
+
class EditView(BrowserView):
"""Simple edit-view base class
Modified: five.formlib/trunk/src/five/formlib/formbase.py
===================================================================
--- five.formlib/trunk/src/five/formlib/formbase.py 2012-05-19 12:56:19 UTC (rev 126385)
+++ five.formlib/trunk/src/five/formlib/formbase.py 2012-05-19 15:40:14 UTC (rev 126386)
@@ -47,7 +47,7 @@
# BBB: for CMFDefault < 2.3 (explicit charset required)
self.request.RESPONSE.setHeader('Content-Type',
'text/html; charset=%s' % HTTPRequest.default_encoding)
- # BBB: for Zope < 2.14
+ # BBB: for Zope < 4
if not getattr(self.request, 'postProcessInputs', False):
processInputs(self.request, [HTTPRequest.default_encoding])
super(FiveFormlibMixin, self).update()
Modified: five.formlib/trunk/src/five/formlib/metaconfigure.py
===================================================================
--- five.formlib/trunk/src/five/formlib/metaconfigure.py 2012-05-19 12:56:19 UTC (rev 126385)
+++ five.formlib/trunk/src/five/formlib/metaconfigure.py 2012-05-19 15:40:14 UTC (rev 126386)
@@ -11,41 +11,29 @@
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
-"""Edit form directives
-$Id$
-"""
+from AccessControl.security import protectClass
from App.class_init import InitializeClass
from ExtensionClass import Base
import zope.component
from zope.interface import Interface
from zope.i18nmessageid import MessageFactory
-_ = MessageFactory('zope')
-# BBB Zope 2.12
-try:
- from zope.browsermenu.metaconfigure import menuItemDirective
-except ImportError:
- from zope.app.publisher.browser.menumeta import menuItemDirective
-
from zope.app.form.browser.metaconfigure import BaseFormDirective
from zope.browser.interfaces import IAdding
+from zope.browsermenu.metaconfigure import menuItemDirective
from zope.publisher.interfaces.browser import IDefaultBrowserLayer
-# BBB Zope 2.12
-try:
- from AccessControl.security import protectClass
-except ImportError:
- from Products.Five.security import protectClass
-
from Products.Five.metaclass import makeClass
from Products.Five.browser.pagetemplatefile import ZopeTwoPageTemplateFile
from Products.Five.browser.metaconfigure import makeClassForTemplate
from five.formlib import EditView, AddView
+_ = MessageFactory('zope')
+
def EditViewFactory(name, schema, label, permission, layer,
template, default_template, bases, for_, fields,
fulledit_path=None, fulledit_label=None, menu=u''):
Modified: five.formlib/trunk/src/five/formlib/objectwidget.py
===================================================================
--- five.formlib/trunk/src/five/formlib/objectwidget.py 2012-05-19 12:56:19 UTC (rev 126385)
+++ five.formlib/trunk/src/five/formlib/objectwidget.py 2012-05-19 15:40:14 UTC (rev 126386)
@@ -23,9 +23,10 @@
from AccessControl.SecurityInfo import ClassSecurityInfo
from App.class_init import InitializeClass
from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile
-from zope.app.form.browser.objectwidget import ObjectWidget as OWBase
-from zope.app.form.browser.objectwidget import ObjectWidgetView as OWVBase
+from zope.formlib.objectwidget import ObjectWidget as OWBase
+from zope.formlib.objectwidget import ObjectWidgetView as OWVBase
+
class ObjectWidgetView(OWVBase):
security = ClassSecurityInfo()
security.declareObjectPublic()
@@ -34,6 +35,7 @@
InitializeClass(ObjectWidgetView)
+
class ObjectWidgetClass(OWBase):
def setRenderedValue(self, value):
Modified: five.formlib/trunk/src/five/formlib/tests/configure.zcml
===================================================================
--- five.formlib/trunk/src/five/formlib/tests/configure.zcml 2012-05-19 12:56:19 UTC (rev 126385)
+++ five.formlib/trunk/src/five/formlib/tests/configure.zcml 2012-05-19 15:40:14 UTC (rev 126386)
@@ -32,7 +32,7 @@
<view
type="zope.publisher.interfaces.browser.IBrowserRequest"
for="zope.schema.interfaces.IObject"
- provides="zope.app.form.interfaces.IInputWidget"
+ provides="zope.formlib.interfaces.IInputWidget"
factory="five.formlib.objectwidget.ObjectWidget"
permission="zope.Public"
/>
@@ -47,7 +47,7 @@
<widget
field="description"
- class="zope.app.form.browser.TextAreaWidget"
+ class="zope.formlib.textwidgets.TextAreaWidget"
/>
</browser:editform>
@@ -69,7 +69,7 @@
<widget
field="description"
- class="zope.app.form.browser.TextAreaWidget"
+ class="zope.formlib.textwidgets.TextAreaWidget"
/>
</browser:addform>
Modified: five.formlib/trunk/src/five/formlib/tests/formlib.txt
===================================================================
--- five.formlib/trunk/src/five/formlib/tests/formlib.txt 2012-05-19 12:56:19 UTC (rev 126385)
+++ five.formlib/trunk/src/five/formlib/tests/formlib.txt 2012-05-19 15:40:14 UTC (rev 126386)
@@ -16,12 +16,7 @@
We need to configure all of Five and the necessary formlib components for
this test:
- # BBB for Zope 2.12
- >>> try:
- ... from Zope2.App import zcml
- ... except ImportError:
- ... from Products.Five import zcml
-
+ >>> from Zope2.App import zcml
>>> import Products.Five
>>> zcml.load_config('meta.zcml', Products.Five)
>>> import five.formlib
@@ -38,12 +33,7 @@
Let's set up a testbrowser:
- # BBB for Zope 2.12
- >>> try:
- ... from Testing.testbrowser import Browser
- ... except ImportError:
- ... from Products.Five.testbrowser import Browser
-
+ >>> from Testing.testbrowser import Browser
>>> browser = Browser()
>>> browser.addHeader('Accept-Language', 'en-US')
>>> browser.addHeader('Authorization', 'Basic manager:r00t')
Modified: five.formlib/trunk/src/five/formlib/tests/forms.txt
===================================================================
--- five.formlib/trunk/src/five/formlib/tests/forms.txt 2012-05-19 12:56:19 UTC (rev 126385)
+++ five.formlib/trunk/src/five/formlib/tests/forms.txt 2012-05-19 15:40:14 UTC (rev 126386)
@@ -9,12 +9,7 @@
We need to configure all of Five for the functional test:
- # BBB for Zope 2.12
- >>> try:
- ... from Zope2.App import zcml
- ... except ImportError:
- ... from Products.Five import zcml
-
+ >>> from Zope2.App import zcml
>>> import Products.Five
>>> zcml.load_config('meta.zcml', Products.Five)
>>> import five.formlib
@@ -31,12 +26,7 @@
Let's set up a testbrowser:
- # BBB for Zope 2.12
- >>> try:
- ... from Testing.testbrowser import Browser
- ... except ImportError:
- ... from Products.Five.testbrowser import Browser
-
+ >>> from Testing.testbrowser import Browser
>>> browser = Browser()
>>> browser.addHeader('Accept-Language', 'en-US')
Modified: five.formlib/trunk/src/five/formlib/tests/schemacontent.py
===================================================================
--- five.formlib/trunk/src/five/formlib/tests/schemacontent.py 2012-05-19 12:56:19 UTC (rev 126385)
+++ five.formlib/trunk/src/five/formlib/tests/schemacontent.py 2012-05-19 15:40:14 UTC (rev 126386)
@@ -18,15 +18,16 @@
from App.class_init import InitializeClass
from OFS.SimpleItem import SimpleItem
+from zope.formlib.widget import CustomWidgetFactory
from zope.i18nmessageid import MessageFactory
from zope.interface import implements, Interface
from zope.schema import TextLine, Text, Object, Int, List
-from zope.app.form import CustomWidgetFactory
from five.formlib.objectwidget import ObjectWidget
_ = MessageFactory('formtest')
+
class IFieldContent(Interface):
title = TextLine(
Modified: five.formlib/trunk/src/five/formlib/tests/test_formlib.py
===================================================================
--- five.formlib/trunk/src/five/formlib/tests/test_formlib.py 2012-05-19 12:56:19 UTC (rev 126385)
+++ five.formlib/trunk/src/five/formlib/tests/test_formlib.py 2012-05-19 15:40:14 UTC (rev 126386)
@@ -27,12 +27,7 @@
First, load the configuration files:
- # BBB for Zope 2.12
- >>> try:
- ... from Zope2.App import zcml
- ... except ImportError:
- ... from Products.Five import zcml
-
+ >>> from Zope2.App import zcml
>>> import Products.Five
>>> zcml.load_config('configure.zcml', Products.Five)
>>> import zope.app.form.browser
@@ -51,9 +46,9 @@
>>> contactname = contactname.bind(request)
>>> from zope.component import getMultiAdapter
- >>> from zope.app.form.interfaces import IInputWidget
- >>> from zope.app.form.browser.textwidgets import TextWidget
- >>> from zope.app.form.browser.itemswidgets import DropdownWidget
+ >>> from zope.formlib.interfaces import IInputWidget
+ >>> from zope.formlib.textwidgets import TextWidget
+ >>> from zope.formlib.itemswidgets import DropdownWidget
>>> view1 = getMultiAdapter((contactname, request), IInputWidget)
>>> view1.__class__ == TextWidget
More information about the checkins
mailing list