[Checkins] SVN: Products.CMFDefault/trunk/ - Removed ``five.formlib`` dependency. ``zope.formlib`` is now used directly.
Yvo Schubbe
y.2011 at wcm-solutions.de
Tue Mar 1 04:23:56 EST 2011
Log message for revision 120623:
- Removed ``five.formlib`` dependency. ``zope.formlib`` is now used directly.
Changed:
U Products.CMFDefault/trunk/Products/CMFDefault/CHANGES.txt
U Products.CMFDefault/trunk/Products/CMFDefault/browser/content/folder.py
UU Products.CMFDefault/trunk/Products/CMFDefault/configure.zcml
U Products.CMFDefault/trunk/Products/CMFDefault/formlib/form.py
D Products.CMFDefault/trunk/Products/CMFDefault/meta.zcml
U Products.CMFDefault/trunk/setup.py
-=-
Modified: Products.CMFDefault/trunk/Products/CMFDefault/CHANGES.txt
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/CHANGES.txt 2011-03-01 09:19:18 UTC (rev 120622)
+++ Products.CMFDefault/trunk/Products/CMFDefault/CHANGES.txt 2011-03-01 09:23:55 UTC (rev 120623)
@@ -4,11 +4,13 @@
2.3.0-alpha (unreleased)
------------------------
+- Removed ``five.formlib`` dependency. ``zope.formlib`` is now used directly.
+
- profiles: Added default settings for the member data tool.
- upgrade: Added upgrade step for member data tool settings.
-- Skins and browser views: Fixed 'login_time' handling.
+- skins and browser views: Fixed 'login_time' handling.
Should be working with string and DateTime values because the MemberDataTool
settings might be inconsistent.
@@ -28,8 +30,6 @@
- skins: Removed unused styles from css.
-- Use the optional five.formlib extension in favor of Products.Five.formlib.
-
- Removed testing dependency on zope.app.testing.
- Upgrade steps: Merged faulty utility registration fixup script,
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/content/folder.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/content/folder.py 2011-03-01 09:19:18 UTC (rev 120622)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/content/folder.py 2011-03-01 09:23:55 UTC (rev 120623)
@@ -16,19 +16,18 @@
LOG = logging.getLogger("Folder contents views")
import urllib
-from five.formlib.formbase import PageForm
+from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile
from zope.formlib import form
-from zope import schema
from zope.schema.vocabulary import SimpleTerm
from zope.schema.vocabulary import SimpleVocabulary
from zope.sequencesort.ssort import sort
from ZTUtils import Batch
from ZTUtils import LazyFilter
-from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile
-
from Products.CMFCore.interfaces import IDynamicType
-
+from Products.CMFDefault.browser.utils import decode
+from Products.CMFDefault.browser.utils import memoize
+from Products.CMFDefault.browser.utils import ViewBase
from Products.CMFDefault.exceptions import CopyError
from Products.CMFDefault.exceptions import zExceptions_Unauthorized
from Products.CMFDefault.formlib.form import _EditFormMixin
@@ -36,8 +35,7 @@
from Products.CMFDefault.permissions import ManageProperties
from Products.CMFDefault.utils import Message as _
-from Products.CMFDefault.browser.utils import decode, memoize, ViewBase
-from interfaces import IDeltaItem, IFolderItem, IBatchForm, ISortForm
+from .interfaces import IDeltaItem, IFolderItem, IBatchForm, ISortForm
def contents_delta_vocabulary(context):
"""Vocabulary for the pulldown for moving objects up and down.
@@ -232,7 +230,7 @@
self.widget = "%s.select" % self.name
-class ContentsView(BatchViewBase, _EditFormMixin, PageForm):
+class ContentsView(BatchViewBase, _EditFormMixin, form.PageForm):
"""Folder contents view"""
template = ViewPageTemplateFile('folder_contents.pt')
Modified: Products.CMFDefault/trunk/Products/CMFDefault/configure.zcml
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/configure.zcml 2011-03-01 09:19:18 UTC (rev 120622)
+++ Products.CMFDefault/trunk/Products/CMFDefault/configure.zcml 2011-03-01 09:23:55 UTC (rev 120623)
@@ -1,7 +1,7 @@
<configure
xmlns="http://namespaces.zope.org/zope">
- <include package="five.formlib"/>
+ <include package="zope.formlib"/>
<include package=".skin"/>
Property changes on: Products.CMFDefault/trunk/Products/CMFDefault/configure.zcml
___________________________________________________________________
Deleted: svn:keywords
- Author Date Id Revision
Modified: Products.CMFDefault/trunk/Products/CMFDefault/formlib/form.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/formlib/form.py 2011-03-01 09:19:18 UTC (rev 120622)
+++ Products.CMFDefault/trunk/Products/CMFDefault/formlib/form.py 2011-03-01 09:23:55 UTC (rev 120623)
@@ -18,9 +18,8 @@
from AccessControl.SecurityInfo import ClassSecurityInfo
from App.class_init import InitializeClass
-from five.formlib.formbase import PageAddForm
-from five.formlib.formbase import PageDisplayForm
-from five.formlib.formbase import PageForm
+from Products.Five.browser.decode import processInputs
+from Products.Five.browser.decode import setPageEncoding
from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile
from zope.component import adapts
from zope.component import getUtility
@@ -71,18 +70,23 @@
return ''
+ def update(self):
+ processInputs(self.request)
+ setPageEncoding(self.request)
+ super(_EditFormMixin, self).update()
+
def handle_failure(self, action, data, errors):
if self.status:
message = translate(self.status, self.context)
self.request.other['portal_status_message'] = message
-class EditFormBase(_EditFormMixin, PageForm):
+class EditFormBase(_EditFormMixin, form.PageForm):
pass
-class SettingsEditFormBase(_EditFormMixin, PageForm):
+class SettingsEditFormBase(_EditFormMixin, form.PageForm):
"""Base class for editing global settings.
"""
@@ -127,7 +131,7 @@
return changes
-class ContentAddFormBase(_EditFormMixin, PageAddForm):
+class ContentAddFormBase(_EditFormMixin, form.PageAddForm):
adapts(IFolderish, ICMFDefaultSkin, ITypeInformation)
implementsOnly(IPageForm)
@@ -297,10 +301,15 @@
return self._setRedirect('portal_types', 'object/view')
-class DisplayFormBase(PageDisplayForm, ViewBase):
+class DisplayFormBase(form.PageDisplayForm, ViewBase):
template = ViewPageTemplateFile('viewform.pt')
+ def update(self):
+ processInputs(self.request)
+ setPageEncoding(self.request)
+ super(DisplayFormBase, self).update()
+
@property
def label(self):
return self.context.Type()
Deleted: Products.CMFDefault/trunk/Products/CMFDefault/meta.zcml
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/meta.zcml 2011-03-01 09:19:18 UTC (rev 120622)
+++ Products.CMFDefault/trunk/Products/CMFDefault/meta.zcml 2011-03-01 09:23:55 UTC (rev 120623)
@@ -1,6 +0,0 @@
-<configure
- xmlns="http://namespaces.zope.org/zope">
-
- <include package="five.formlib" file="meta.zcml" />
-
-</configure>
Modified: Products.CMFDefault/trunk/setup.py
===================================================================
--- Products.CMFDefault/trunk/setup.py 2011-03-01 09:19:18 UTC (rev 120622)
+++ Products.CMFDefault/trunk/setup.py 2011-03-01 09:23:55 UTC (rev 120623)
@@ -47,11 +47,11 @@
install_requires=[
'setuptools',
'Zope2 >= 2.13.4',
- 'five.formlib',
'Products.CMFCore',
'Products.GenericSetup',
'Products.MailHost',
'Products.PythonScripts',
+ 'zope.formlib',
],
tests_require=[
'zope.testing >= 3.7.0',
More information about the checkins
mailing list