[Checkins] SVN: Products.CMFDefault/trunk/Products/CMFDefault/formlib/form.py - handle different input processing in different Zope versions
Yvo Schubbe
y.2011 at wcm-solutions.de
Tue Mar 8 05:10:57 EST 2011
Log message for revision 120795:
- handle different input processing in different Zope versions
Changed:
U Products.CMFDefault/trunk/Products/CMFDefault/formlib/form.py
-=-
Modified: Products.CMFDefault/trunk/Products/CMFDefault/formlib/form.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/formlib/form.py 2011-03-08 10:10:25 UTC (rev 120794)
+++ Products.CMFDefault/trunk/Products/CMFDefault/formlib/form.py 2011-03-08 10:10:56 UTC (rev 120795)
@@ -19,7 +19,6 @@
from AccessControl.SecurityInfo import ClassSecurityInfo
from App.class_init import InitializeClass
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
@@ -29,6 +28,7 @@
from zope.formlib.interfaces import IPageForm
from zope.interface import implementsOnly
from zope.schema import ASCIILine
+from ZPublisher import HTTPRequest
from ZTUtils import make_query
from Products.CMFCore.interfaces import IFolderish
@@ -71,8 +71,9 @@
return ''
def update(self):
- processInputs(self.request)
- setPageEncoding(self.request)
+ # BBB: for Zope < 2.14
+ if not getattr(self.request, 'postProcessInputs', False):
+ processInputs(self.request, [HTTPRequest.default_encoding])
super(_EditFormMixin, self).update()
def handle_failure(self, action, data, errors):
@@ -306,8 +307,9 @@
template = ViewPageTemplateFile('viewform.pt')
def update(self):
- processInputs(self.request)
- setPageEncoding(self.request)
+ # BBB: for Zope < 2.14
+ if not getattr(self.request, 'postProcessInputs', False):
+ processInputs(self.request, [HTTPRequest.default_encoding])
super(DisplayFormBase, self).update()
@property
More information about the checkins
mailing list