[Checkins] SVN: z3c.form/trunk/ Merge from jinty-ptcompat branch. This causes test failures and makes z3c.form
Brian Sutherland
jinty at web.de
Mon Feb 9 12:30:05 EST 2009
Log message for revision 96320:
Merge from jinty-ptcompat branch. This causes test failures and makes z3c.form
depend on an unreleased z3c.ptcompat. But I was advised to commit anyway
http://mail.zope.org/pipermail/zope-dev/2009-February/034477.html.
------------------------------------------------------------------------
r93840 | jinty | 2008-12-10 11:10:05 +0100 (Wed, 10 Dec 2008) | 1 line
use z3c.ptcompat rather that z3c.pt.compat.
Changed:
U z3c.form/trunk/CHANGES.txt
U z3c.form/trunk/buildout.cfg
U z3c.form/trunk/setup.py
U z3c.form/trunk/src/z3c/form/adding.txt
U z3c.form/trunk/src/z3c/form/browser/objectmulti.txt
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/object.py
U z3c.form/trunk/src/z3c/form/subform.txt
U z3c.form/trunk/src/z3c/form/testing.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 2009-02-09 15:03:38 UTC (rev 96319)
+++ z3c.form/trunk/CHANGES.txt 2009-02-09 17:30:05 UTC (rev 96320)
@@ -42,7 +42,7 @@
- Feature: Allow overriding the "required" widget attribute using IValue adapter
just like it's done for "label" and "name" attributes.
-- Refactoring: Use the ``z3c.pt.compat`` template engine compatibility
+- Refactoring: Use the ``z3c.ptcompat`` template engine compatibility
layer.
- Feature: Added Support for using sources: where is was previosly
Modified: z3c.form/trunk/buildout.cfg
===================================================================
--- z3c.form/trunk/buildout.cfg 2009-02-09 15:03:38 UTC (rev 96319)
+++ z3c.form/trunk/buildout.cfg 2009-02-09 17:30:05 UTC (rev 96320)
@@ -3,9 +3,6 @@
parts = test checker coverage-test coverage-report i18n benchmark
versions = versions
-[versions]
-z3c.pt.compat = 0.3
-
[test-environment]
CHAMELEON_DEBUG = False
CHAMELEON_CACHE = False
Modified: z3c.form/trunk/setup.py
===================================================================
--- z3c.form/trunk/setup.py 2009-02-09 15:03:38 UTC (rev 96319)
+++ z3c.form/trunk/setup.py 2009-02-09 17:30:05 UTC (rev 96320)
@@ -106,7 +106,7 @@
'zope.security',
'zope.site',
'zope.traversing',
- 'z3c.pt.compat >= 0.3', # XXX This should change to z3c.ptcompat
+ 'z3c.ptcompat',
],
zip_safe = False,
)
Modified: z3c.form/trunk/src/z3c/form/adding.txt
===================================================================
--- z3c.form/trunk/src/z3c/form/adding.txt 2009-02-09 15:03:38 UTC (rev 96319)
+++ z3c.form/trunk/src/z3c/form/adding.txt 2009-02-09 17:30:05 UTC (rev 96320)
@@ -52,7 +52,7 @@
for it now:
>>> import os
- >>> from z3c.pt import compat as viewpagetemplatefile
+ >>> from z3c import ptcompat as viewpagetemplatefile
>>> from z3c.form import tests, field
>>> from z3c.form.adding import AddForm
Modified: z3c.form/trunk/src/z3c/form/browser/objectmulti.txt
===================================================================
--- z3c.form/trunk/src/z3c/form/browser/objectmulti.txt 2009-02-09 15:03:38 UTC (rev 96319)
+++ z3c.form/trunk/src/z3c/form/browser/objectmulti.txt 2009-02-09 17:30:05 UTC (rev 96320)
@@ -1014,4 +1014,4 @@
<input class="submit-widget button-field" id="foo-buttons-remove" name="foo.buttons.remove" type="submit" value="Remove selected">
</div>
</div>
- <input name="foo.count" type="hidden" value="2">
\ No newline at end of file
+ <input name="foo.count" type="hidden" value="2">
Modified: z3c.form/trunk/src/z3c/form/error.py
===================================================================
--- z3c.form/trunk/src/z3c/form/error.py 2009-02-09 15:03:38 UTC (rev 96319)
+++ z3c.form/trunk/src/z3c/form/error.py 2009-02-09 17:30:05 UTC (rev 96320)
@@ -20,7 +20,7 @@
import zope.component
import zope.interface
import zope.schema
-from z3c.pt.compat import ViewPageTemplateFile
+from z3c.ptcompat 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 2009-02-09 15:03:38 UTC (rev 96319)
+++ z3c.form/trunk/src/z3c/form/error.txt 2009-02-09 17:30:05 UTC (rev 96320)
@@ -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 z3c.pt import compat as viewpagetemplatefile
+ >>> from z3c import ptcompat 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 2009-02-09 15:03:38 UTC (rev 96319)
+++ z3c.form/trunk/src/z3c/form/form.py 2009-02-09 17:30:05 UTC (rev 96320)
@@ -21,7 +21,7 @@
import zope.component
import zope.event
import zope.lifecycleevent
-from z3c.pt.compat import ViewPageTemplateFile
+from z3c.ptcompat 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 2009-02-09 15:03:38 UTC (rev 96319)
+++ z3c.form/trunk/src/z3c/form/form.txt 2009-02-09 17:30:05 UTC (rev 96320)
@@ -289,7 +289,7 @@
very simple template as part of this example:
>>> import os
- >>> from z3c.pt import compat as viewpagetemplatefile
+ >>> from z3c import ptcompat as viewpagetemplatefile
>>> from z3c.form import tests
>>> def addTemplate(form):
... form.template = viewpagetemplatefile.bind_template(
Modified: z3c.form/trunk/src/z3c/form/group.txt
===================================================================
--- z3c.form/trunk/src/z3c/form/group.txt 2009-02-09 15:03:38 UTC (rev 96319)
+++ z3c.form/trunk/src/z3c/form/group.txt 2009-02-09 17:30:05 UTC (rev 96320)
@@ -60,7 +60,7 @@
one of the base classes. The groups are specified in a simple tuple:
>>> import os
- >>> from z3c.pt import compat as viewpagetemplatefile
+ >>> from z3c import ptcompat as viewpagetemplatefile
>>> from z3c.form import form, tests
>>> class RegistrationAddForm(group.GroupForm, form.AddForm):
Modified: z3c.form/trunk/src/z3c/form/object.py
===================================================================
--- z3c.form/trunk/src/z3c/form/object.py 2009-02-09 15:03:38 UTC (rev 96319)
+++ z3c.form/trunk/src/z3c/form/object.py 2009-02-09 17:30:05 UTC (rev 96320)
@@ -25,7 +25,7 @@
from zope.security.proxy import removeSecurityProxy
from zope.pagetemplate.interfaces import IPageTemplate
-from z3c.pt import compat as viewpagetemplatefile
+from z3c import ptcompat as viewpagetemplatefile
from z3c.form.converter import BaseDataConverter
from z3c.form import form, interfaces, util, widget
Modified: z3c.form/trunk/src/z3c/form/subform.txt
===================================================================
--- z3c.form/trunk/src/z3c/form/subform.txt 2009-02-09 15:03:38 UTC (rev 96319)
+++ z3c.form/trunk/src/z3c/form/subform.txt 2009-02-09 17:30:05 UTC (rev 96320)
@@ -68,7 +68,7 @@
is the template, which should not render a form-tag:
>>> import os
- >>> from z3c.pt import compat as viewpagetemplatefile
+ >>> from z3c import ptcompat 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 2009-02-09 15:03:38 UTC (rev 96319)
+++ z3c.form/trunk/src/z3c/form/testing.py 2009-02-09 17:30:05 UTC (rev 96320)
@@ -41,10 +41,10 @@
from z3c.form.browser import radio, select, text, textarea
from z3c.form.browser import file as fileWidget
-from z3c.pt.compat.testing import render
-from z3c.pt.compat.testing import OutputChecker
+from z3c.ptcompat.testing import render
+from z3c.ptcompat.testing import OutputChecker
-import z3c.pt.compat
+import z3c.ptcompat
import lxml.html
import lxml.doctestcompare
@@ -186,11 +186,11 @@
test.globs = {'root': setup.placefulSetUp(True)}
def setUpZPT(suite):
- z3c.pt.compat.config.disable()
+ z3c.ptcompat.config.disable()
setUp(suite)
def setUpZ3CPT(suite):
- z3c.pt.compat.config.enable()
+ z3c.ptcompat.config.enable()
setUp(suite)
zope.configuration.xmlconfig.XMLConfig('configure.zcml', z3c.pt)()
Modified: z3c.form/trunk/src/z3c/form/widget.py
===================================================================
--- z3c.form/trunk/src/z3c/form/widget.py 2009-02-09 15:03:38 UTC (rev 96319)
+++ z3c.form/trunk/src/z3c/form/widget.py 2009-02-09 17:30:05 UTC (rev 96320)
@@ -22,7 +22,7 @@
import zope.location
import zope.schema.interfaces
from zope.pagetemplate.interfaces import IPageTemplate
-from z3c.pt import compat as viewpagetemplatefile
+from z3c import ptcompat 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 2009-02-09 15:03:38 UTC (rev 96319)
+++ z3c.form/trunk/src/z3c/form/zcml.txt 2009-02-09 17:30:05 UTC (rev 96320)
@@ -74,7 +74,7 @@
and check it:
- >>> from z3c.pt.compat import ViewPageTemplateFile
+ >>> from z3c.ptcompat import ViewPageTemplateFile
>>> isinstance(template, ViewPageTemplateFile)
True
More information about the Checkins
mailing list