[Checkins] SVN: Products.GenericSetup/trunk/ Require at least Zope 2.12.3 and use the optional five.formlib extension.
Hanno Schlichting
hannosch at hannosch.eu
Thu Jan 14 16:16:06 EST 2010
Log message for revision 108130:
Require at least Zope 2.12.3 and use the optional five.formlib extension.
Changed:
U Products.GenericSetup/trunk/Products/GenericSetup/CHANGES.txt
U Products.GenericSetup/trunk/Products/GenericSetup/browser/components.py
U Products.GenericSetup/trunk/setup.py
-=-
Modified: Products.GenericSetup/trunk/Products/GenericSetup/CHANGES.txt
===================================================================
--- Products.GenericSetup/trunk/Products/GenericSetup/CHANGES.txt 2010-01-14 21:15:20 UTC (rev 108129)
+++ Products.GenericSetup/trunk/Products/GenericSetup/CHANGES.txt 2010-01-14 21:16:06 UTC (rev 108130)
@@ -4,6 +4,8 @@
1.6.0 (unreleased)
------------------
+- Require at least Zope 2.12.3 and use the optional five.formlib extension.
+
- Fixed bug in the export code of persistent utilities with explicit OFS ids.
- Prefer the class over the five:implements ZCML directive.
@@ -29,7 +31,7 @@
1.5.0b1 (2009-09-25)
--------------------
-- LP #388380: removed obsolute STX docs from the package directory.
+- LP #388380: removed obsolete STX docs from the package directory.
- Made export / import features for old-school TextIndex (removed in Zope 2.12)
conditional.
Modified: Products.GenericSetup/trunk/Products/GenericSetup/browser/components.py
===================================================================
--- Products.GenericSetup/trunk/Products/GenericSetup/browser/components.py 2010-01-14 21:15:20 UTC (rev 108129)
+++ Products.GenericSetup/trunk/Products/GenericSetup/browser/components.py 2010-01-14 21:16:06 UTC (rev 108130)
@@ -17,12 +17,8 @@
from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile
from Products.Five.component.interfaces import IObjectManagerSite
-# BBB Zope 2.12
-try:
- from five.formlib.formbase import PageEditForm
-except ImportError:
- from Products.Five.formlib.formbase import PageEditForm
+from five.formlib.formbase import PageEditForm
from zope.component import adapts
from zope.component import getMultiAdapter
from zope.formlib import form
Modified: Products.GenericSetup/trunk/setup.py
===================================================================
--- Products.GenericSetup/trunk/setup.py 2010-01-14 21:15:20 UTC (rev 108129)
+++ Products.GenericSetup/trunk/setup.py 2010-01-14 21:16:06 UTC (rev 108130)
@@ -52,7 +52,8 @@
],
install_requires=[
'setuptools',
- #'Zope2 >= 2.10',
+ 'Zope2 >= 2.12.3',
+ 'five.formlib >= 1.0.2',
'five.localsitemanager >= 0.2',
],
tests_require=[
More information about the checkins
mailing list