[Checkins] SVN: Products.CMFDefault/branches/2.2/Products/CMFDefault/ Backport c107333 from trunk
Hanno Schlichting
hannosch at hannosch.eu
Tue Dec 29 20:02:46 EST 2009
Log message for revision 107334:
Backport c107333 from trunk
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/formlib/form.py
-=-
Modified: Products.CMFDefault/branches/2.2/Products/CMFDefault/CHANGES.txt
===================================================================
--- Products.CMFDefault/branches/2.2/Products/CMFDefault/CHANGES.txt 2009-12-30 00:51:43 UTC (rev 107333)
+++ Products.CMFDefault/branches/2.2/Products/CMFDefault/CHANGES.txt 2009-12-30 01:02:45 UTC (rev 107334)
@@ -4,6 +4,8 @@
2.2.0 (unreleased)
------------------
+- Use five.formlib in favor of Products.Five.formlib if it is available.
+
- skins: Fixed skin changing for logged in members.
- Upgrade steps: Merged faulty utility registration fixup script,
Modified: Products.CMFDefault/branches/2.2/Products/CMFDefault/browser/folder.py
===================================================================
--- Products.CMFDefault/branches/2.2/Products/CMFDefault/browser/folder.py 2009-12-30 00:51:43 UTC (rev 107333)
+++ Products.CMFDefault/branches/2.2/Products/CMFDefault/browser/folder.py 2009-12-30 01:02:45 UTC (rev 107334)
@@ -28,7 +28,11 @@
from zope.formlib import form
from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile
-from Products.Five.formlib.formbase import PageForm
+# 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/formlib/form.py
===================================================================
--- Products.CMFDefault/branches/2.2/Products/CMFDefault/formlib/form.py 2009-12-30 00:51:43 UTC (rev 107333)
+++ Products.CMFDefault/branches/2.2/Products/CMFDefault/formlib/form.py 2009-12-30 01:02:45 UTC (rev 107334)
@@ -21,9 +21,16 @@
from AccessControl.SecurityInfo import ClassSecurityInfo
from App.class_init import InitializeClass
from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile
-from Products.Five.formlib.formbase import PageAddForm
-from Products.Five.formlib.formbase import PageDisplayForm
-from Products.Five.formlib.formbase import PageForm
+# 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 zope.component import adapts
from zope.component import getUtility
from zope.component.interfaces import IFactory
More information about the checkins
mailing list