[Checkins] SVN: megrok.genshi/trunk/src/megrok/genshi/components.py Using the new grok.direct directive.

[Lennart Regebro]

Log message for revision 80636:
  Using the new grok.direct directive.
  

Changed:
  U   megrok.genshi/trunk/src/megrok/genshi/components.py

-=-
Modified: megrok.genshi/trunk/src/megrok/genshi/components.py
===================================================================
--- megrok.genshi/trunk/src/megrok/genshi/components.py	2007-10-05 12:32:44 UTC (rev 80635)
+++ megrok.genshi/trunk/src/megrok/genshi/components.py	2007-10-05 12:33:08 UTC (rev 80636)
@@ -46,28 +46,31 @@
         self.__grok_module__ = martian.util.caller_module()
 
         
-class GenshiMarkupTemplateFile(GenshiTemplateBase):
+class GenshiMarkupTemplateFile(GenshiTemplateBase, grok.components.GlobalUtility):
 
     zope.interface.implements(grok.interfaces.ITemplateFile)
-    zope.interface.classProvides(grok.interfaces.ITemplateFactory)
+    zope.interface.classProvides(grok.interfaces.ITemplateFileFactory)
+    grok.name('g')
+    grok.direct()
 
     result_type = 'xhtml'
 
     def __init__(self, filename, _prefix=None):
         loader = genshi.template.TemplateLoader(_prefix)
         self._template = loader.load(filename)
+        self.__grok_module__ = martian.util.caller_module()
 
-grok.global_utility(GenshiMarkupTemplateFile, name='g', direct=True)
 
-class GenshiTextTemplateFile(GenshiTemplateBase):
+class GenshiTextTemplateFile(GenshiTemplateBase, grok.components.GlobalUtility):
 
     result_type = 'xhtml'
     
     zope.interface.implements(grok.interfaces.ITemplateFile)
-    zope.interface.classProvides(grok.interfaces.ITemplateFactory)
+    zope.interface.classProvides(grok.interfaces.ITemplateFileFactory)
+    grok.name('gt')
+    grok.direct()
     
     def __init__(self, filename, _prefix=None):
         loader = genshi.template.TemplateLoader(_prefix)
         self._template = loader.load(filename, cls=genshi.template.TextTemplate)
-
-grok.global_utility(GenshiTextTemplateFile, name='gt', direct=True)
\ No newline at end of file
+        self.__grok_module__ = martian.util.caller_module()