[Checkins] SVN: z3c.formui/trunk/ Checkpoint: add support for z3c.pt. However README.txt test still fails because of different macro representation in zope.tal and z3c.pt. The test needs to be adapted.

[Dan Korostelev]

Log message for revision 97380:
  Checkpoint: add support for z3c.pt. However README.txt test still fails because of different macro representation in zope.tal and z3c.pt. The test needs to be adapted.

Changed:
  U   z3c.formui/trunk/CHANGES.txt
  U   z3c.formui/trunk/buildout.cfg
  U   z3c.formui/trunk/src/z3c/formui/README.txt
  U   z3c.formui/trunk/src/z3c/formui/tests.py

-=-
Modified: z3c.formui/trunk/CHANGES.txt
===================================================================
--- z3c.formui/trunk/CHANGES.txt	2009-02-28 11:27:22 UTC (rev 97379)
+++ z3c.formui/trunk/CHANGES.txt	2009-02-28 11:46:44 UTC (rev 97380)
@@ -5,6 +5,9 @@
 1.5.0 (unreleased)
 ------------------
 
+- Feature: Added support for ``z3c.pt`` tempaltes using ``z3c.ptcompat``
+  compatibility package.
+
 - Feature: Added layout support for ``IAdding`` component based add forms.
 
 - Feature: Added CSS for multi-widget which was added in `z3c.form` 2.0.0

Modified: z3c.formui/trunk/buildout.cfg
===================================================================
--- z3c.formui/trunk/buildout.cfg	2009-02-28 11:27:22 UTC (rev 97379)
+++ z3c.formui/trunk/buildout.cfg	2009-02-28 11:46:44 UTC (rev 97380)
@@ -1,15 +1,25 @@
 [buildout]
-develop = .
+develop =
+  .
+  ../z3c.form
+  ../z3c.macro
+  ../z3c.pt
 parts = test coverage-test coverage-report
 
 [test]
 recipe = zc.recipe.testrunner
 eggs = z3c.formui [test]
+environment = test-environment
 
+[test-environment]
+CHAMELEON_DEBUG = False
+CHAMELEON_CACHE = False
+
 [coverage-test]
 recipe = zc.recipe.testrunner
 eggs = z3c.formui [test]
 defaults = ['--coverage', '../../coverage']
+environment = test-environment
 
 [coverage-report]
 recipe = zc.recipe.egg

Modified: z3c.formui/trunk/src/z3c/formui/README.txt
===================================================================
--- z3c.formui/trunk/src/z3c/formui/README.txt	2009-02-28 11:27:22 UTC (rev 97379)
+++ z3c.formui/trunk/src/z3c/formui/README.txt	2009-02-28 11:46:44 UTC (rev 97380)
@@ -128,8 +128,9 @@
   >>> layout = zope.component.getMultiAdapter((addForm, divRequest),
   ...     ILayoutTemplate)
 
-  >>> layout
-  <zope.app.pagetemplate.viewpagetemplatefile.ViewPageTemplateFile object at ...>
+  >>> from z3c import ptcompat
+  >>> isinstance(layout, ptcompat.ViewPageTemplateFile)
+  True
 
 
 DIV-based Layout
@@ -346,8 +347,8 @@
   >>> layout = zope.component.getMultiAdapter(
   ...     (addForm, divRequest), ILayoutTemplate)
 
-  >>> layout
-  <zope.app.pagetemplate.viewpagetemplatefile.ViewPageTemplateFile ...>
+  >>> isinstance(layout, ptcompat.ViewPageTemplateFile)
+  True
 
 Okay, that worked. Let's now render the div-based addform:
 
@@ -409,8 +410,8 @@
   >>> layout = zope.component.getMultiAdapter((addForm, tableRequest),
   ...     ILayoutTemplate)
 
-  >>> layout
-  <zope.app.pagetemplate.viewpagetemplatefile.ViewPageTemplateFile ...>
+  >>> isinstance(layout, ptcompat.ViewPageTemplateFile)
+  True
 
 Let's now render the form:
 
@@ -693,13 +694,10 @@
   >>> from z3c.template.template import getPageTemplate
   >>> from z3c.template.template import getLayoutTemplate
 
-We also need the provider TALES expression which is a part of the lookup
-concept:
+The ``provider`` TALES expression which is a part of the lookup concept
+was already registered by the testing setup, so we don't need to do it
+here.
 
-  >>> from zope.app.pagetemplate import metaconfigure
-  >>> from zope.contentprovider import tales
-  >>> metaconfigure.registerType('provider', tales.TALESProviderExpression)
-
 and the TALES expression called ``macro`` which can lookup our macro adapters.
 Yes, macros are adapters in our content/layout template concept. See z3c.macro
 for more information about the implementation. However, we already registered

Modified: z3c.formui/trunk/src/z3c/formui/tests.py
===================================================================
--- z3c.formui/trunk/src/z3c/formui/tests.py	2009-02-28 11:27:22 UTC (rev 97379)
+++ z3c.formui/trunk/src/z3c/formui/tests.py	2009-02-28 11:46:44 UTC (rev 97380)
@@ -18,19 +18,27 @@
 
 import unittest
 from zope.testing import doctest
-from zope.app.pagetemplate.metaconfigure import registerType
-from z3c.macro.tales import MacroExpression
 
 from z3c.form import testing
 
-def setUp(test):
-    testing.setUp(test)
+def setUpZPT(test):
+    testing.setUpZPT(test)
+    from zope.app.pagetemplate.metaconfigure import registerType
+    from zope.contentprovider.tales import TALESProviderExpression
+    from z3c.macro.tales import MacroExpression
     registerType('macro', MacroExpression)
+    registerType('provider', TALESProviderExpression)
 
+def setUpZ3CPT(test):
+    testing.setUpZ3CPT(test)
+    from zope.component import provideUtility
+    from z3c.macro.tales import z3cpt_macro_expression
+    provideUtility(z3cpt_macro_expression, name='macro')
+
 def test_suite():
-    return unittest.TestSuite((
+    return unittest.TestSuite([
         doctest.DocFileSuite('README.txt',
             setUp=setUp, tearDown=testing.tearDown,
             optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS,
-            checker=testing.OutputChecker()),
-        ))
+            checker=testing.OutputChecker(doctest))
+        for setUp in (setUpZPT, setUpZ3CPT)])