[Checkins] SVN: Products.CMFDefault/trunk/ Require at least Zope 2.12.3 and use the optional five.formlib extension.

[Hanno Schlichting]

Log message for revision 108129:
  Require at least Zope 2.12.3 and use the optional five.formlib extension.
  

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
  U   Products.CMFDefault/trunk/setup.py

-=-
Modified: Products.CMFDefault/trunk/Products/CMFDefault/CHANGES.txt
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/CHANGES.txt	2010-01-14 21:14:31 UTC (rev 108128)
+++ Products.CMFDefault/trunk/Products/CMFDefault/CHANGES.txt	2010-01-14 21:15:20 UTC (rev 108129)
@@ -4,6 +4,8 @@
 2.3.0-alpha (unreleased)
 ------------------------
 
+- Require at least Zope 2.12.3 and use the optional five.formlib extension.
+
 - Use five.formlib in favor of Products.Five.formlib if it is available.
 
 - Removed testing dependency on zope.app.testing.

Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/folder.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/folder.py	2010-01-14 21:14:31 UTC (rev 108128)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/folder.py	2010-01-14 21:15:20 UTC (rev 108129)
@@ -25,14 +25,10 @@
 from zope.schema.vocabulary import SimpleTerm
 from zope.schema.vocabulary import SimpleVocabulary
 
+from five.formlib.formbase import PageForm
 from zope.formlib import form
 
 from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile
-# 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	2010-01-14 21:14:31 UTC (rev 108128)
+++ Products.CMFDefault/trunk/Products/CMFDefault/formlib/form.py	2010-01-14 21:15:20 UTC (rev 108129)
@@ -21,16 +21,10 @@
 from AccessControl.SecurityInfo import ClassSecurityInfo
 from App.class_init import InitializeClass
 from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile
-# 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 five.formlib.formbase import PageAddForm
+from five.formlib.formbase import PageDisplayForm
+from five.formlib.formbase import PageForm
 from zope.component import adapts
 from zope.component import getUtility
 from zope.component.interfaces import IFactory

Modified: Products.CMFDefault/trunk/setup.py
===================================================================
--- Products.CMFDefault/trunk/setup.py	2010-01-14 21:14:31 UTC (rev 108128)
+++ Products.CMFDefault/trunk/setup.py	2010-01-14 21:15:20 UTC (rev 108129)
@@ -46,7 +46,8 @@
                      ],
       install_requires=[
           'setuptools',
-          'Zope2 >= 2.12.0',
+          'five.formlib >= 1.0.2',
+          'Zope2 >= 2.12.3',
           'Products.CMFCore',
           'Products.GenericSetup',
           ],