[Checkins] SVN: Products.CMFDefault/trunk/Products/CMFDefault/ Use five.formlib in favor of Products.Five.formlib if it is available.

[Hanno Schlichting]

Log message for revision 107333:
  Use five.formlib in favor of Products.Five.formlib if it is available.
  

Changed:
  U   Products.CMFDefault/trunk/Products/CMFDefault/CHANGES.txt
  U   Products.CMFDefault/trunk/Products/CMFDefault/browser/folder.py
  U   Products.CMFDefault/trunk/Products/CMFDefault/formlib/form.py

-=-
Modified: Products.CMFDefault/trunk/Products/CMFDefault/CHANGES.txt
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/CHANGES.txt	2009-12-30 00:51:11 UTC (rev 107332)
+++ Products.CMFDefault/trunk/Products/CMFDefault/CHANGES.txt	2009-12-30 00:51:43 UTC (rev 107333)
@@ -4,6 +4,8 @@
 2.3.0-alpha (unreleased)
 ------------------------
 
+- Use five.formlib in favor of Products.Five.formlib if it is available.
+
 - Removed testing dependency on zope.app.testing.
 
 - Upgrade steps: Merged faulty utility registration fixup script,

Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/folder.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/folder.py	2009-12-30 00:51:11 UTC (rev 107332)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/folder.py	2009-12-30 00:51:43 UTC (rev 107333)
@@ -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/trunk/Products/CMFDefault/formlib/form.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/formlib/form.py	2009-12-30 00:51:11 UTC (rev 107332)
+++ Products.CMFDefault/trunk/Products/CMFDefault/formlib/form.py	2009-12-30 00:51:43 UTC (rev 107333)
@@ -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