[Checkins] SVN: z3c.formui/trunk/ Use adapter-based macro lookup instead of template/macros/macroname one. The latter one doesn't work when using custom form templates that uses form macros defined here.

[Dan Korostelev]

Log message for revision 96295:
  Use adapter-based macro lookup instead of template/macros/macroname one. The latter one doesn't work when using custom form templates that uses form macros defined here.
  
  Add z3c.form[test] as a test dependency for z3c.formui, because we lose the zope.app.testing.
  
  Remove download_links from setup.py.

Changed:
  U   z3c.formui/trunk/CHANGES.txt
  U   z3c.formui/trunk/setup.py
  U   z3c.formui/trunk/src/z3c/formui/README.txt
  U   z3c.formui/trunk/src/z3c/formui/div-form-display.pt
  U   z3c.formui/trunk/src/z3c/formui/div-form.pt
  U   z3c.formui/trunk/src/z3c/formui/table-form-display.pt
  U   z3c.formui/trunk/src/z3c/formui/table-form.pt
  U   z3c.formui/trunk/src/z3c/formui/tests.py

-=-
Modified: z3c.formui/trunk/CHANGES.txt
===================================================================
--- z3c.formui/trunk/CHANGES.txt	2009-02-09 08:12:18 UTC (rev 96294)
+++ z3c.formui/trunk/CHANGES.txt	2009-02-09 08:35:41 UTC (rev 96295)
@@ -9,6 +9,9 @@
 
 - Feature: Added CSS for multi-widget which was added in `z3c.form` 2.0.0
 
+- Bug: Changed usage of "template/macros/*" to "macro:*, because the first
+  one doesn't work when we override a form template and use the form macro,
+  registered with this package.
 
 Version 1.4.2 (2008-08-26)
 --------------------------

Modified: z3c.formui/trunk/setup.py
===================================================================
--- z3c.formui/trunk/setup.py	2009-02-09 08:12:18 UTC (rev 96294)
+++ z3c.formui/trunk/setup.py	2009-02-09 08:35:41 UTC (rev 96295)
@@ -58,7 +58,7 @@
     package_dir = {'':'src'},
     namespace_packages = ['z3c'],
     extras_require = dict(
-        test = ['zope.testing'],
+        test = ['zope.testing', 'z3c.form [test]'],
         ),
     install_requires = [
         'setuptools',
@@ -69,6 +69,5 @@
         'zope.publisher',
         'zope.viewlet',
         ],
-    dependency_links = ['http://download.zope.org/distribution'],
     zip_safe = False,
     )

Modified: z3c.formui/trunk/src/z3c/formui/README.txt
===================================================================
--- z3c.formui/trunk/src/z3c/formui/README.txt	2009-02-09 08:12:18 UTC (rev 96294)
+++ z3c.formui/trunk/src/z3c/formui/README.txt	2009-02-09 08:35:41 UTC (rev 96295)
@@ -702,17 +702,16 @@
 
 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:
+for more information about the implementation. However, we already registered
+the ``macro`` type in the testing setup, as it's needed for rendering form
+templates.
 
-  >>> from zope.app.pagetemplate import metaconfigure
-  >>> from z3c.macro import tales
-  >>> metaconfigure.registerType('macro', tales.MacroExpression)
+and at least we need a pagelet
+renderer. By default we use the provider called ``PageletRenderer`` defined
+in the z3c.pagelet package. But right now, we don't have a dependency on
+this package. So let's implement a simple renderer and use them as a
+IContentProvider:
 
-and at least we need a pagelet renderer. By default we use the provider called
-``PageletRenderer`` defined in the z3c.pagelet package. But right now, we
-don't have a dependency on this package. So let's implement a simple renderer
-and use them as a IContentProvider:
-
   >>> class PageletRenderer(object):
   ...     zope.component.adapts(zope.interface.Interface,
   ...         zope.publisher.interfaces.browser.IBrowserRequest,

Modified: z3c.formui/trunk/src/z3c/formui/div-form-display.pt
===================================================================
--- z3c.formui/trunk/src/z3c/formui/div-form-display.pt	2009-02-09 08:12:18 UTC (rev 96294)
+++ z3c.formui/trunk/src/z3c/formui/div-form-display.pt	2009-02-09 08:35:41 UTC (rev 96295)
@@ -40,11 +40,11 @@
           <metal:block define-slot="group-header">
             <div class="status"
                  tal:condition="view/widgets/errors">
-              <div metal:use-macro="template/macros/errors" />
+              <div metal:use-macro="macro:form-errors" />
             </div>
           </metal:block>
           <metal:block define-slot="group-rows">
-            <div metal:use-macro="template/macros/widget-rows" />
+            <div metal:use-macro="macro:widget-rows" />
           </metal:block>
         </fieldset>
       </metal:block>

Modified: z3c.formui/trunk/src/z3c/formui/div-form.pt
===================================================================
--- z3c.formui/trunk/src/z3c/formui/div-form.pt	2009-02-09 08:12:18 UTC (rev 96294)
+++ z3c.formui/trunk/src/z3c/formui/div-form.pt	2009-02-09 08:35:41 UTC (rev 96295)
@@ -83,11 +83,11 @@
           <metal:block define-slot="group-header">
             <div class="status"
                  tal:condition="view/widgets/errors">
-              <div metal:use-macro="template/macros/errors" />
+              <div metal:use-macro="macro:form-errors" />
             </div>
           </metal:block>
           <metal:block define-slot="group-rows">
-            <div metal:use-macro="template/macros/widget-rows" />
+            <div metal:use-macro="macro:widget-rows" />
           </metal:block>
         </fieldset>
       </metal:block>

Modified: z3c.formui/trunk/src/z3c/formui/table-form-display.pt
===================================================================
--- z3c.formui/trunk/src/z3c/formui/table-form-display.pt	2009-02-09 08:12:18 UTC (rev 96294)
+++ z3c.formui/trunk/src/z3c/formui/table-form-display.pt	2009-02-09 08:35:41 UTC (rev 96295)
@@ -52,7 +52,7 @@
           <metal:block define-slot="group-header">
           </metal:block>
           <metal:block define-slot="group-rows">
-            <div metal:use-macro="template/macros/formtable" />
+            <div metal:use-macro="macro:form-table" />
           </metal:block>
         </fieldset>
       </metal:block>

Modified: z3c.formui/trunk/src/z3c/formui/table-form.pt
===================================================================
--- z3c.formui/trunk/src/z3c/formui/table-form.pt	2009-02-09 08:12:18 UTC (rev 96294)
+++ z3c.formui/trunk/src/z3c/formui/table-form.pt	2009-02-09 08:35:41 UTC (rev 96295)
@@ -97,11 +97,11 @@
           <metal:block define-slot="group-header">
             <div class="status"
                  tal:condition="view/widgets/errors">
-              <div metal:use-macro="template/macros/errors" />
+              <div metal:use-macro="macro:form-errors" />
             </div>
           </metal:block>
           <metal:block define-slot="group-rows">
-            <div metal:use-macro="template/macros/formtable" />
+            <div metal:use-macro="macro:form-table" />
           </metal:block>
         </fieldset>
       </metal:block>

Modified: z3c.formui/trunk/src/z3c/formui/tests.py
===================================================================
--- z3c.formui/trunk/src/z3c/formui/tests.py	2009-02-09 08:12:18 UTC (rev 96294)
+++ z3c.formui/trunk/src/z3c/formui/tests.py	2009-02-09 08:35:41 UTC (rev 96295)
@@ -18,13 +18,19 @@
 
 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)
+    registerType('macro', MacroExpression)
 
 def test_suite():
     return unittest.TestSuite((
         doctest.DocFileSuite('README.txt',
-            setUp=testing.setUp, tearDown=testing.tearDown,
-            optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS),
+            setUp=setUp, tearDown=testing.tearDown,
+            optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS,
+            checker=testing.OutputChecker()),
         ))