[Checkins] SVN: Sandbox/darrylcousins/tfws.website/mars. Commits for adater, form and template which have been updated in getting mars.formdemo to work again using martian 0.9.3 and grok 0.12dev trunk

[Darryl Cousins]

Log message for revision 83814:
  Commits for adater, form and template which have been updated in getting mars.formdemo to work again using martian 0.9.3 and grok 0.12dev trunk

Changed:
  U   Sandbox/darrylcousins/tfws.website/mars.adapter/mars/adapter/meta.py
  U   Sandbox/darrylcousins/tfws.website/mars.form/mars/form/meta.py
  U   Sandbox/darrylcousins/tfws.website/mars.template/mars/template/meta.py

-=-
Modified: Sandbox/darrylcousins/tfws.website/mars.adapter/mars/adapter/meta.py
===================================================================
--- Sandbox/darrylcousins/tfws.website/mars.adapter/mars/adapter/meta.py	2008-02-14 05:10:30 UTC (rev 83813)
+++ Sandbox/darrylcousins/tfws.website/mars.adapter/mars/adapter/meta.py	2008-02-14 05:14:16 UTC (rev 83814)
@@ -20,6 +20,8 @@
         adapter_context = zope.component.registry._getAdapterRequired(
                                     adapter_factory, None)
 
+        #print '\n',name,'\n',adapter_factory,'\n',provides,'\n',adapter_context
+
         if adapter_factory is None:
             raise GrokError(
                     "mars.adapter.factory must be provided for AdapterFactory"
@@ -30,8 +32,5 @@
                 callable=zope.component.provideAdapter,
                 args=(adapter_factory, adapter_context, provides, name),
                 )
-            #zope.component.provideAdapter(adapter_factory, 
-            #                              adapts=adapter_context, 
-            #                              provides=provides, name=name)
 
         return True

Modified: Sandbox/darrylcousins/tfws.website/mars.form/mars/form/meta.py
===================================================================
--- Sandbox/darrylcousins/tfws.website/mars.form/mars/form/meta.py	2008-02-14 05:10:30 UTC (rev 83813)
+++ Sandbox/darrylcousins/tfws.website/mars.form/mars/form/meta.py	2008-02-14 05:14:16 UTC (rev 83814)
@@ -68,8 +68,8 @@
         provides = util.class_annotation(factory, 'grok.provides', self.provides)
         contentType = util.class_annotation(factory,
                                     'mars.template.content_type', 'text/html')
-        view_layer = util.class_annotation(factory, 'mars.layer.layer',
-                                       None) or module_info.getAnnotation('mars.layer.layer',
+        view_layer = util.class_annotation(factory, 'grok.layer',
+                                       None) or module_info.getAnnotation('grok.layer',
                                        None) or IDefaultBrowserLayer
         mode = util.class_annotation(factory, 'grok.name', INPUT_MODE)
         view = util.class_annotation(factory, 'mars.form.view', None)
@@ -78,11 +78,9 @@
 
         factory = WidgetTemplateFactory(filepath, contentType)
         zope.interface.directlyProvides(factory, provides)
-        #print '\nname:', mode,'context:', view_context,'factory:',\
-        #      factory, 'provides', provides, 'view:', view, 'field:', field, \
-        #      'widget:', widget, '\n'
 
         adapts = (view_context, view_layer, view, field, widget)
+        #print '\n',mode,'\n',factory,'\n',provides,'\n',adapts
         config.action( 
             discriminator=('adapter', adapts, self.provides, mode),
             callable=zope.component.provideAdapter,

Modified: Sandbox/darrylcousins/tfws.website/mars.template/mars/template/meta.py
===================================================================
--- Sandbox/darrylcousins/tfws.website/mars.template/mars/template/meta.py	2008-02-14 05:10:30 UTC (rev 83813)
+++ Sandbox/darrylcousins/tfws.website/mars.template/mars/template/meta.py	2008-02-14 05:14:16 UTC (rev 83814)
@@ -64,8 +64,9 @@
         zope.interface.directlyProvides(factory, provides)
 
         adapts = (view_context, view_layer)
-        #print '\n', adapts, factory, provides
 
+#        print '\n',view_name,'\n',factory,'\n',provides,'\n',adapts
+
         config.action( 
             discriminator=('adapter', adapts, provides, view_name),
             callable=zope.component.provideAdapter,