[Checkins] SVN: z3c.form/branches/adamg-z3c-pt-optional/ final touches about z3c.pt
Adam Groszer
agroszer at gmail.com
Sat Jun 13 10:56:53 EDT 2009
Log message for revision 100915:
final touches about z3c.pt
Changed:
U z3c.form/branches/adamg-z3c-pt-optional/CHANGES.txt
U z3c.form/branches/adamg-z3c-pt-optional/buildout.cfg
U z3c.form/branches/adamg-z3c-pt-optional/setup.py
U z3c.form/branches/adamg-z3c-pt-optional/src/z3c/form/ptcompat.py
-=-
Modified: z3c.form/branches/adamg-z3c-pt-optional/CHANGES.txt
===================================================================
--- z3c.form/branches/adamg-z3c-pt-optional/CHANGES.txt 2009-06-13 11:20:55 UTC (rev 100914)
+++ z3c.form/branches/adamg-z3c-pt-optional/CHANGES.txt 2009-06-13 14:56:53 UTC (rev 100915)
@@ -5,6 +5,15 @@
Version 2.0.0 (unreleased)
--------------------------
+- KGS 3.4 compatibility. This is a real hard thing, because z3c.form tests
+ use lxml >= 2.1.1 to check test output, but KGS 3.4 has lxml 1.3.6.
+ Therefore we agree on that if tests pass with all package versions nailed by
+ KGS 3.4 but lxml overridden to 2.1.1 then the z3c.form package works with a
+ plain KGS 3.4.
+
+- Feature: Removed hard z3c.ptcompat and thus z3c.pt dependency.
+ If you have z3c.ptcompat on the pythonpath it will be used.
+
- Feature: Added nested group support. Groups are rendered as fieldsets.
Nested fieldsets are very useful when designing forms.
Modified: z3c.form/branches/adamg-z3c-pt-optional/buildout.cfg
===================================================================
--- z3c.form/branches/adamg-z3c-pt-optional/buildout.cfg 2009-06-13 11:20:55 UTC (rev 100914)
+++ z3c.form/branches/adamg-z3c-pt-optional/buildout.cfg 2009-06-13 14:56:53 UTC (rev 100915)
@@ -2,19 +2,6 @@
develop = . benchmark
parts = test checker coverage-test coverage-report docs i18n python
-#####################################################
-# REMOVE THIS BEFORE MERGE!
-extends = http://download.zope.org/zope3.4/3.4.0/versions.cfg
-versions = versions
-
-[versions]
-z3c.form=
-lxml = 2.1.1
-zc.sourcefactory = 0.4.0
-zope.container = 3.8.1
-#
-#####################################################
-
[test-environment]
CHAMELEON_DEBUG = False
CHAMELEON_CACHE = False
Modified: z3c.form/branches/adamg-z3c-pt-optional/setup.py
===================================================================
--- z3c.form/branches/adamg-z3c-pt-optional/setup.py 2009-06-13 11:20:55 UTC (rev 100914)
+++ z3c.form/branches/adamg-z3c-pt-optional/setup.py 2009-06-13 14:56:53 UTC (rev 100915)
@@ -89,7 +89,7 @@
'z3c.coverage',
'z3c.template',
'zc.sourcefactory',
- 'lxml',
+ 'lxml >= 2.1.1',
],
adding = ['zope.app.container'],
docs = ['z3c.recipe.sphinxdoc'],
Modified: z3c.form/branches/adamg-z3c-pt-optional/src/z3c/form/ptcompat.py
===================================================================
--- z3c.form/branches/adamg-z3c-pt-optional/src/z3c/form/ptcompat.py 2009-06-13 11:20:55 UTC (rev 100914)
+++ z3c.form/branches/adamg-z3c-pt-optional/src/z3c/form/ptcompat.py 2009-06-13 14:56:53 UTC (rev 100915)
@@ -17,16 +17,14 @@
"""
__docformat__ = "reStructuredText"
+#import utilities from z3c.ptcompat when available and set AVAILABLE flag
+
try:
from z3c.ptcompat import ViewPageTemplateFile
+ from z3c.ptcompat import bind_template
AVAILABLE = True
except ImportError:
AVAILABLE = False
-
-if AVAILABLE:
- #ViewPageTemplateFile = ptcompat.ViewPageTemplateFile
- from z3c.ptcompat import bind_template
-else:
from zope.app.pagetemplate.viewpagetemplatefile import ViewPageTemplateFile
from zope.app.pagetemplate.viewpagetemplatefile import BoundPageTemplate \
as bind_template
More information about the Checkins
mailing list