[Checkins] SVN: megrok.z3cform/branches/megrok.z3cfrom-layout/src/megrok/z3cform/ Using the z3c.form defaults for directives context and view

[Christian Klinger]

Log message for revision 101290:
  Using the z3c.form defaults for directives context and view

Changed:
  U   megrok.z3cform/branches/megrok.z3cfrom-layout/src/megrok/z3cform/directives.py
  U   megrok.z3cform/branches/megrok.z3cfrom-layout/src/megrok/z3cform/meta.py
  U   megrok.z3cform/branches/megrok.z3cfrom-layout/src/megrok/z3cform/tests/test_widgettemplate.py

-=-
Modified: megrok.z3cform/branches/megrok.z3cfrom-layout/src/megrok/z3cform/directives.py
===================================================================
--- megrok.z3cform/branches/megrok.z3cfrom-layout/src/megrok/z3cform/directives.py	2009-06-26 12:13:27 UTC (rev 101289)
+++ megrok.z3cform/branches/megrok.z3cfrom-layout/src/megrok/z3cform/directives.py	2009-06-26 14:46:14 UTC (rev 101290)
@@ -14,12 +14,6 @@
     default = interfaces.INPUT_MODE 
     # validate = validateInterfaceOrClass
 
-class view(martian.Directive):
-    scope = martian.CLASS
-    store = martian.ONCE
-    default = None
-    # validate = validateInterfaceOrClass
-
 class widget(martian.Directive):
     scope = martian.CLASS
     store = martian.ONCE

Modified: megrok.z3cform/branches/megrok.z3cfrom-layout/src/megrok/z3cform/meta.py
===================================================================
--- megrok.z3cform/branches/megrok.z3cfrom-layout/src/megrok/z3cform/meta.py	2009-06-26 12:13:27 UTC (rev 101289)
+++ megrok.z3cform/branches/megrok.z3cfrom-layout/src/megrok/z3cform/meta.py	2009-06-26 14:46:14 UTC (rev 101290)
@@ -1,20 +1,22 @@
+import grok
+import martian
+import grokcore.view
+import grokcore.component
 
+
+from z3c.form import field
+from martian.error import GrokError
+from zope.interface import Interface
+from megrok.z3cform import directives
+from megrok.z3cform import components
 from zope.interface.interfaces import IInterface
-
-import grokcore.component
-import grokcore.view
 from grokcore.view.meta.views import ViewGrokker
+from z3c.form.zcml import widgetTemplateDirective
 from grokcore.formlib.formlib import most_specialized_interfaces
 from zope.publisher.interfaces.browser import IDefaultBrowserLayer
 
 
-from martian.error import GrokError
-import martian
 
-from megrok.z3cform import components
-from megrok.z3cform import directives
-from z3c.form import field
-from z3c.form.zcml import widgetTemplateDirective
 
 def get_auto_fields(context):
     """Get the form fields for context.
@@ -60,10 +62,10 @@
 class WidgetTemplateGrokker(martian.ClassGrokker):
     """ grokker for widget templates """
     martian.component(components.WidgetTemplate)
-    martian.directive(grokcore.component.context)
+    martian.directive(grokcore.component.context, default=Interface)
     martian.directive(grokcore.view.layer, default=IDefaultBrowserLayer)
     martian.directive(grokcore.view.template)
-    martian.directive(directives.view)
+    martian.directive(grok.view)
     martian.directive(directives.field)
     martian.directive(directives.mode)
     martian.directive(directives.widget)

Modified: megrok.z3cform/branches/megrok.z3cfrom-layout/src/megrok/z3cform/tests/test_widgettemplate.py
===================================================================
--- megrok.z3cform/branches/megrok.z3cfrom-layout/src/megrok/z3cform/tests/test_widgettemplate.py	2009-06-26 12:13:27 UTC (rev 101289)
+++ megrok.z3cform/branches/megrok.z3cfrom-layout/src/megrok/z3cform/tests/test_widgettemplate.py	2009-06-26 14:46:14 UTC (rev 101290)
@@ -127,7 +127,7 @@
 class CustomTemplate(z3cform.WidgetTemplate):
     grok.context(Person)
     grok.template('custom_string.pt')
-    megrok.z3cform.directives.view(interfaces.IAddForm)
+    grok.view(interfaces.IAddForm)
 
 class NewTemplateForIntField(z3cform.WidgetTemplate):
     grok.context(Person)
@@ -137,7 +137,7 @@
 class NewTemplateForTextWidget(z3cform.WidgetTemplate):
     grok.context(Person)
     grok.template('custom_text.pt')
-    megrok.z3cform.directives.view(View2)
+    grok.view(View2)
     megrok.z3cform.directives.widget(interfaces.ITextWidget)
     megrok.z3cform.directives.mode(interfaces.DISPLAY_MODE)