[Checkins] SVN: z3c.form/trunk/ Use page template compatibility layer from z3c.pt.compat to switch between ZPT engines.
Malthe Borch
mborch at gmail.com
Tue Sep 9 18:01:04 EDT 2008
Log message for revision 91011:
Use page template compatibility layer from z3c.pt.compat to switch between ZPT engines.
Changed:
U z3c.form/trunk/CHANGES.txt
U z3c.form/trunk/setup.py
U z3c.form/trunk/src/z3c/form/adding.txt
D z3c.form/trunk/src/z3c/form/config.py
U z3c.form/trunk/src/z3c/form/error.py
U z3c.form/trunk/src/z3c/form/error.txt
U z3c.form/trunk/src/z3c/form/form.py
U z3c.form/trunk/src/z3c/form/form.txt
U z3c.form/trunk/src/z3c/form/group.txt
U z3c.form/trunk/src/z3c/form/subform.txt
U z3c.form/trunk/src/z3c/form/testing.py
D z3c.form/trunk/src/z3c/form/viewpagetemplatefile.py
U z3c.form/trunk/src/z3c/form/widget.py
U z3c.form/trunk/src/z3c/form/zcml.txt
-=-
Modified: z3c.form/trunk/CHANGES.txt
===================================================================
--- z3c.form/trunk/CHANGES.txt 2008-09-09 21:55:56 UTC (rev 91010)
+++ z3c.form/trunk/CHANGES.txt 2008-09-09 22:01:02 UTC (rev 91011)
@@ -5,6 +5,9 @@
Version 2.0.0 (2008-??-??)
--------------------------
+- Refactoring: Use the ``z3c.pt.compat`` template engine compatibility
+ layer.
+
- Feature: Added benchmarking suite demonstrating performance gain
when using ``z3c.pt``.
Modified: z3c.form/trunk/setup.py
===================================================================
--- z3c.form/trunk/setup.py 2008-09-09 21:55:56 UTC (rev 91010)
+++ z3c.form/trunk/setup.py 2008-09-09 22:01:02 UTC (rev 91011)
@@ -78,11 +78,11 @@
test = [
'zope.app.testing',
'zope.app.container',
+ 'zope.app.i18n',
'zope.testing',
'z3c.coverage',
'z3c.template',
'z3c.pt',
- 'zope.app.i18n',
'lxml',
],
adding = ['zope.app.container'],
@@ -104,6 +104,7 @@
'zope.schema',
'zope.security',
'zope.traversing',
+ 'z3c.pt.compat',
],
dependency_links = ['http://download.zope.org/distribution'],
zip_safe = False,
Modified: z3c.form/trunk/src/z3c/form/adding.txt
===================================================================
--- z3c.form/trunk/src/z3c/form/adding.txt 2008-09-09 21:55:56 UTC (rev 91010)
+++ z3c.form/trunk/src/z3c/form/adding.txt 2008-09-09 22:01:02 UTC (rev 91011)
@@ -52,7 +52,7 @@
for it now:
>>> import os
- >>> from zope.app.pagetemplate import viewpagetemplatefile
+ >>> from z3c.pt import compat as viewpagetemplatefile
>>> from z3c.form import tests, field
>>> from z3c.form.adding import AddForm
Deleted: z3c.form/trunk/src/z3c/form/config.py
===================================================================
--- z3c.form/trunk/src/z3c/form/config.py 2008-09-09 21:55:56 UTC (rev 91010)
+++ z3c.form/trunk/src/z3c/form/config.py 2008-09-09 22:01:02 UTC (rev 91011)
@@ -1,5 +0,0 @@
-import os
-
-PREFER_Z3C_PT = os.environ.get("PREFER_Z3C_PT", 'false').lower() in \
- ('y', 'yes', 't', 'true', 'on', '1')
-
Modified: z3c.form/trunk/src/z3c/form/error.py
===================================================================
--- z3c.form/trunk/src/z3c/form/error.py 2008-09-09 21:55:56 UTC (rev 91010)
+++ z3c.form/trunk/src/z3c/form/error.py 2008-09-09 22:01:02 UTC (rev 91011)
@@ -20,7 +20,7 @@
import zope.component
import zope.interface
import zope.schema
-from z3c.form.viewpagetemplatefile import ViewPageTemplateFile
+from z3c.pt.compat import ViewPageTemplateFile
from zope.pagetemplate.interfaces import IPageTemplate
import z3c.form
Modified: z3c.form/trunk/src/z3c/form/error.txt
===================================================================
--- z3c.form/trunk/src/z3c/form/error.txt 2008-09-09 21:55:56 UTC (rev 91010)
+++ z3c.form/trunk/src/z3c/form/error.txt 2008-09-09 22:01:02 UTC (rev 91011)
@@ -99,7 +99,7 @@
needs, sometimes one wishes to register a custom view to have more complex
views. In this example we wish to register a custom error message:
- >>> from zope.app.pagetemplate import viewpagetemplatefile
+ >>> from z3c.pt import compat as viewpagetemplatefile
>>> from z3c.form import tests
>>> class NegativeAgeView(error.ErrorViewSnippet):
Modified: z3c.form/trunk/src/z3c/form/form.py
===================================================================
--- z3c.form/trunk/src/z3c/form/form.py 2008-09-09 21:55:56 UTC (rev 91010)
+++ z3c.form/trunk/src/z3c/form/form.py 2008-09-09 22:01:02 UTC (rev 91011)
@@ -21,7 +21,7 @@
import zope.component
import zope.event
import zope.lifecycleevent
-from z3c.form.viewpagetemplatefile import ViewPageTemplateFile
+from z3c.pt.compat import ViewPageTemplateFile
from zope.publisher import browser
from zope.pagetemplate.interfaces import IPageTemplate
from zope.schema.fieldproperty import FieldProperty
Modified: z3c.form/trunk/src/z3c/form/form.txt
===================================================================
--- z3c.form/trunk/src/z3c/form/form.txt 2008-09-09 21:55:56 UTC (rev 91010)
+++ z3c.form/trunk/src/z3c/form/form.txt 2008-09-09 22:01:02 UTC (rev 91011)
@@ -289,10 +289,10 @@
very simple template as part of this example:
>>> import os
- >>> from zope.app.pagetemplate import viewpagetemplatefile
+ >>> from z3c.pt import compat as viewpagetemplatefile
>>> from z3c.form import tests
>>> def addTemplate(form):
- ... form.template = viewpagetemplatefile.BoundPageTemplate(
+ ... form.template = viewpagetemplatefile.bind_template(
... viewpagetemplatefile.ViewPageTemplateFile(
... 'simple_edit.pt', os.path.dirname(tests.__file__)), form)
>>> addTemplate(addForm)
Modified: z3c.form/trunk/src/z3c/form/group.txt
===================================================================
--- z3c.form/trunk/src/z3c/form/group.txt 2008-09-09 21:55:56 UTC (rev 91010)
+++ z3c.form/trunk/src/z3c/form/group.txt 2008-09-09 22:01:02 UTC (rev 91011)
@@ -60,7 +60,7 @@
one of the base classes. The groups are specified in a simple tuple:
>>> import os
- >>> from zope.app.pagetemplate import viewpagetemplatefile
+ >>> from z3c.pt import compat as viewpagetemplatefile
>>> from z3c.form import form, tests
>>> class RegistrationAddForm(group.GroupForm, form.AddForm):
Modified: z3c.form/trunk/src/z3c/form/subform.txt
===================================================================
--- z3c.form/trunk/src/z3c/form/subform.txt 2008-09-09 21:55:56 UTC (rev 91010)
+++ z3c.form/trunk/src/z3c/form/subform.txt 2008-09-09 22:01:02 UTC (rev 91011)
@@ -68,7 +68,7 @@
is the template, which should not render a form-tag:
>>> import os
- >>> from zope.app.pagetemplate import viewpagetemplatefile
+ >>> from z3c.pt import compat as viewpagetemplatefile
>>> from z3c.form import form, field, tests
>>> templatePath = os.path.dirname(tests.__file__)
Modified: z3c.form/trunk/src/z3c/form/testing.py
===================================================================
--- z3c.form/trunk/src/z3c/form/testing.py 2008-09-09 21:55:56 UTC (rev 91010)
+++ z3c.form/trunk/src/z3c/form/testing.py 2008-09-09 22:01:02 UTC (rev 91011)
@@ -34,13 +34,11 @@
from zope.app.testing import setup
from zope.testing.doctest import register_optionflag
-from z3c.form import config
-from z3c.form import viewpagetemplatefile
from z3c.form import browser, button, converter, datamanager, error, field
from z3c.form import form, interfaces, term, validator, widget
from z3c.form.browser import radio, select, text
-import z3c.pt
+import z3c.pt.compat
import lxml.html
import lxml.doctestcompare
@@ -147,13 +145,11 @@
test.globs = {'root': setup.placefulSetUp(True)}
def setUpZPT(suite):
- config.PREFER_Z3C_PT = False
- reload(viewpagetemplatefile)
+ z3c.pt.compat.config.disable()
setUp(suite)
def setUpZ3CPT(suite):
- config.PREFER_Z3C_PT = True
- reload(viewpagetemplatefile)
+ z3c.pt.compat.config.enable()
setUp(suite)
zope.configuration.xmlconfig.XMLConfig('configure.zcml', z3c.pt)()
Deleted: z3c.form/trunk/src/z3c/form/viewpagetemplatefile.py
===================================================================
--- z3c.form/trunk/src/z3c/form/viewpagetemplatefile.py 2008-09-09 21:55:56 UTC (rev 91010)
+++ z3c.form/trunk/src/z3c/form/viewpagetemplatefile.py 2008-09-09 22:01:02 UTC (rev 91011)
@@ -1,32 +0,0 @@
-##############################################################################
-#
-# Copyright (c) 2008 Zope Foundation and Contributors.
-# All Rights Reserved.
-#
-# This software is subject to the provisions of the Zope Public License,
-# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
-# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FOR A PARTICULAR PURPOSE.
-#
-##############################################################################
-"""Form and Widget Framework Interfaces
-
-$Id: interfaces.py 90925 2008-09-08 06:30:06Z hermann $
-"""
-__docformat__ = "reStructuredText"
-import config
-
-if config.PREFER_Z3C_PT:
- from z3c.pt.pagetemplate import ViewPageTemplateFile
-
- def bind_template(pt, view):
- return pt.bind(view)
-else:
- from zope.app.pagetemplate.viewpagetemplatefile import ViewPageTemplateFile
- from zope.app.pagetemplate.viewpagetemplatefile import BoundPageTemplate
- bind_template = BoundPageTemplate
-
-class ViewPageTemplateFile(ViewPageTemplateFile):
- pass
Modified: z3c.form/trunk/src/z3c/form/widget.py
===================================================================
--- z3c.form/trunk/src/z3c/form/widget.py 2008-09-09 21:55:56 UTC (rev 91010)
+++ z3c.form/trunk/src/z3c/form/widget.py 2008-09-09 22:01:02 UTC (rev 91011)
@@ -22,7 +22,7 @@
import zope.location
import zope.schema.interfaces
from zope.pagetemplate.interfaces import IPageTemplate
-from z3c.form import viewpagetemplatefile
+from z3c.pt import compat as viewpagetemplatefile
from zope.i18n import translate
from zope.schema.fieldproperty import FieldProperty
Modified: z3c.form/trunk/src/z3c/form/zcml.txt
===================================================================
--- z3c.form/trunk/src/z3c/form/zcml.txt 2008-09-09 21:55:56 UTC (rev 91010)
+++ z3c.form/trunk/src/z3c/form/zcml.txt 2008-09-09 22:01:02 UTC (rev 91011)
@@ -75,7 +75,7 @@
and check it:
>>> template
- <z3c.form.viewpagetemplatefile.ViewPageTemplateFile object at ...>
+ <z3c.pt.compat.ViewPageTemplateFile object at ...>
Let's use the template within the widget.
More information about the Checkins
mailing list