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

[Hanno Schlichting]

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

Changed:
  U   Products.GenericSetup/trunk/Products/GenericSetup/CHANGES.txt
  U   Products.GenericSetup/trunk/Products/GenericSetup/browser/components.py

-=-
Modified: Products.GenericSetup/trunk/Products/GenericSetup/CHANGES.txt
===================================================================
--- Products.GenericSetup/trunk/Products/GenericSetup/CHANGES.txt	2009-12-29 23:46:24 UTC (rev 107331)
+++ Products.GenericSetup/trunk/Products/GenericSetup/CHANGES.txt	2009-12-30 00:51:11 UTC (rev 107332)
@@ -4,6 +4,8 @@
 1.5.0 (unreleased)
 ------------------
 
+- Use five.formlib in favor of Products.Five.formlib if it is available.
+
 - Removed testing dependency on zope.app.testing.ztapi.
 
 - tarball contexts: Fixed export and import of directory structures.

Modified: Products.GenericSetup/trunk/Products/GenericSetup/browser/components.py
===================================================================
--- Products.GenericSetup/trunk/Products/GenericSetup/browser/components.py	2009-12-29 23:46:24 UTC (rev 107331)
+++ Products.GenericSetup/trunk/Products/GenericSetup/browser/components.py	2009-12-30 00:51:11 UTC (rev 107332)
@@ -17,7 +17,12 @@
 
 from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile
 from Products.Five.component.interfaces import IObjectManagerSite
-from Products.Five.formlib.formbase import PageEditForm
+# BBB Zope 2.12
+try:
+    from five.formlib.formbase import PageEditForm
+except ImportError:
+    from Products.Five.formlib.formbase import PageEditForm
+
 from zope.component import adapts
 from zope.component import getMultiAdapter
 from zope.formlib import form