[Checkins] SVN: megrok.genshi/trunk/src/megrok/genshi/ Get rid of the factories.

[Lennart Regebro]

Log message for revision 80632:
  Get rid of the factories.
  

Changed:
  U   megrok.genshi/trunk/src/megrok/genshi/components.py
  U   megrok.genshi/trunk/src/megrok/genshi/ftesting.zcml
  D   megrok.genshi/trunk/src/megrok/genshi/templatereg.py

-=-
Modified: megrok.genshi/trunk/src/megrok/genshi/components.py
===================================================================
--- megrok.genshi/trunk/src/megrok/genshi/components.py	2007-10-05 10:13:06 UTC (rev 80631)
+++ megrok.genshi/trunk/src/megrok/genshi/components.py	2007-10-05 11:33:16 UTC (rev 80632)
@@ -19,7 +19,7 @@
 import grok
 import martian
 
-class GenshiTemplateBase(object):
+class GenshiTemplateBase(grok.components.GrokPageTemplate):
 
     def __call__(self, namespace):
         stream = self._template.generate(**namespace)
@@ -37,7 +37,7 @@
         return self(namespace)
 
 
-class GenshiMarkupTemplate(GenshiTemplateBase, grok.components.PageTemplate):
+class GenshiMarkupTemplate(GenshiTemplateBase):
     
     result_type = 'xhtml'
     
@@ -46,24 +46,28 @@
         self.__grok_module__ = martian.util.caller_module()
 
         
-class GenshiMarkupTemplateFile(GenshiTemplateBase, grok.components.GrokPageTemplate):
+class GenshiMarkupTemplateFile(GenshiTemplateBase):
 
     zope.interface.implements(grok.interfaces.ITemplateFile)
+    zope.interface.classProvides(grok.interfaces.ITemplateFactory)
 
     result_type = 'xhtml'
 
     def __init__(self, filename, _prefix=None):
         loader = genshi.template.TemplateLoader(_prefix)
         self._template = loader.load(filename)
-            
 
-class GenshiTextTemplateFile(GenshiTemplateBase, grok.components.GrokPageTemplate):
+grok.global_utility(GenshiMarkupTemplateFile, name='gmt', direct=True)
 
+class GenshiTextTemplateFile(GenshiTemplateBase):
+
     result_type = 'xhtml'
     
     zope.interface.implements(grok.interfaces.ITemplateFile)
+    zope.interface.classProvides(grok.interfaces.ITemplateFactory)
     
-    def __init__(self, filename, _prefix=None):        
+    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='gtt', direct=True)
\ No newline at end of file

Modified: megrok.genshi/trunk/src/megrok/genshi/ftesting.zcml
===================================================================
--- megrok.genshi/trunk/src/megrok/genshi/ftesting.zcml	2007-10-05 10:13:06 UTC (rev 80631)
+++ megrok.genshi/trunk/src/megrok/genshi/ftesting.zcml	2007-10-05 11:33:16 UTC (rev 80632)
@@ -6,7 +6,6 @@
    >
 
   <include package="grok" />
-  <grok:grok package=".grokkers" />
   <grok:grok package="." />
 
   <!-- Typical functional testing security setup -->

Deleted: megrok.genshi/trunk/src/megrok/genshi/templatereg.py
===================================================================
--- megrok.genshi/trunk/src/megrok/genshi/templatereg.py	2007-10-05 10:13:06 UTC (rev 80631)
+++ megrok.genshi/trunk/src/megrok/genshi/templatereg.py	2007-10-05 11:33:16 UTC (rev 80632)
@@ -1,34 +0,0 @@
-##############################################################################
-#
-# Copyright (c) 2006-2007 Zope Corporation and Contributors.
-# All Rights Reserved.
-#
-# This software is subject to the provisions of the Zope Public License,
-# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
-# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FOR A PARTICULAR PURPOSE.
-#
-##############################################################################
-"""Genshi template registration"""
-
-import grok
-import components
-
-class GenshiMarkupTemplateFileFactory(grok.GlobalUtility):
-    
-    grok.implements(grok.interfaces.ITemplateFactory)
-    grok.name('gmt')
-    
-    def __call__(self, filename, _prefix=None):
-        return components.GenshiMarkupTemplateFile(filename, _prefix)
-
-class GenshiTextTemplateFileFactory(grok.GlobalUtility):
-    
-    grok.implements(grok.interfaces.ITemplateFactory)
-    grok.name('gtt')
-    
-    def __call__(self, filename, _prefix=None):
-        return components.GenshiTextTemplateFile(filename, _prefix)
-    
\ No newline at end of file