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.

CHANGES.txt

@@ -42,7 +42,7 @@ Version 2.0.0 (unreleased)
 - 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

buildout.cfg

@@ -3,9 +3,6 @@ develop = . benchmark
 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

setup.py

@@ -106,7 +106,7 @@ def read(*rnames):
         'zope.security',
         'zope.site',
         'zope.traversing',
-        'z3c.pt.compat >= 0.3', # XXX This should change to z3c.ptcompat
+        'z3c.ptcompat',
         ],
     zip_safe = False,
     )

src/z3c/form/adding.txt

@@ -52,7 +52,7 @@ To be able to create a person using ``IAdding``, we need to create an add form
 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
 

src/z3c/form/browser/objectmulti.txt

@@ -1014,4 +1014,4 @@ if you like to skip the label rendering for all widgets.
       <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">
+  <input name="foo.count" type="hidden" value="2">

src/z3c/form/error.py

@@ -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

src/z3c/form/error.txt

@@ -99,7 +99,7 @@ Even though message attribute values will solve most of our customization
 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):

src/z3c/form/form.py

@@ -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

src/z3c/form/form.txt

@@ -289,7 +289,7 @@ specified a template yet, we have to do this now. We have prepared a small and
 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(

src/z3c/form/group.txt

@@ -60,7 +60,7 @@ comparison to a regular add form, you only need to add the ``GroupForm`` as
 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):

src/z3c/form/object.py

@@ -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

src/z3c/form/subform.txt

@@ -68,7 +68,7 @@ We define the owner sub-form as we would any other form. The only difference
 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__)

src/z3c/form/testing.py

@@ -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 @@ def setUp(test):
     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)()
 

src/z3c/form/widget.py

@@ -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
 

src/z3c/form/zcml.txt

@@ -74,7 +74,7 @@ Let's get the template
 
 and check it:
 
-  >>> from z3c.pt.compat import ViewPageTemplateFile
+  >>> from z3c.ptcompat import ViewPageTemplateFile
   >>> isinstance(template, ViewPageTemplateFile)
   True