[Checkins] SVN: grok/branches/philikon-grokcore.component/grokcore.component/grokcore/component/grokkers.py These grokkers can't depend on the 'templates' keyword, as that will only

[Philipp von Weitershausen]

Log message for revision 79257:
  These grokkers can't depend on the 'templates' keyword, as that will only
  be inserted by grok's prepare handler.  Also lift the  dependency on the
  'context' keyword where possible. Where it's not possible, fall back to 
  None.
  
  This way these grokkers can still operate when the surrounding framework
  doesn't define an automatic context.
  

Changed:
  U   grok/branches/philikon-grokcore.component/grokcore.component/grokcore/component/grokkers.py

-=-
Modified: grok/branches/philikon-grokcore.component/grokcore.component/grokcore/component/grokkers.py
===================================================================
--- grok/branches/philikon-grokcore.component/grokcore.component/grokcore/component/grokkers.py	2007-08-25 13:29:36 UTC (rev 79256)
+++ grok/branches/philikon-grokcore.component/grokcore.component/grokcore/component/grokkers.py	2007-08-25 13:34:20 UTC (rev 79257)
@@ -30,7 +30,7 @@
 class AdapterGrokker(martian.ClassGrokker):
     component_class = Adapter
 
-    def grok(self, name, factory, context, module_info, templates):
+    def grok(self, name, factory, module_info, context=None, **kw):
         adapter_context = util.determine_class_context(factory, context)
         provides = util.class_annotation(factory, 'grok.provides', None)
         if provides is None:
@@ -45,7 +45,7 @@
 class MultiAdapterGrokker(martian.ClassGrokker):
     component_class = MultiAdapter
 
-    def grok(self, name, factory, context, module_info, templates):
+    def grok(self, name, factory, module_info, **kw):
         provides = util.class_annotation(factory, 'grok.provides', None)
         if provides is None:
             util.check_implements_one(factory)
@@ -58,7 +58,7 @@
 class GlobalUtilityGrokker(martian.ClassGrokker):
     component_class = GlobalUtility
 
-    def grok(self, name, factory, context, module_info, templates):
+    def grok(self, name, factory, module_info, **kw):
         provides = util.class_annotation(factory, 'grok.provides', None)
         if provides is None:
             util.check_implements_one(factory)
@@ -69,7 +69,7 @@
 
 class SubscriberGrokker(martian.GlobalGrokker):
 
-    def grok(self, name, module, context, module_info, templates):
+    def grok(self, name, module, module_info, **kw):
         subscribers = module_info.getAnnotation('grok.subscribers', [])
 
         for factory, subscribed in subscribers:
@@ -81,7 +81,7 @@
 
 class AdapterDecoratorGrokker(martian.GlobalGrokker):
 
-    def grok(self, name, module, context, module_info, templates):
+    def grok(self, name, module, module_info, context=None, **kw):
         implementers = module_info.getAnnotation('implementers', [])
         for function in implementers:
             interfaces = getattr(function, '__component_adapts__', None)