[Checkins] SVN: grok/branches/regebro-guido-templates/src/grok/ Genshi support is now in megrok.genshi.

[Lennart Regebro]

Log message for revision 80605:
  Genshi support is now in megrok.genshi.
  

Changed:
  U   grok/branches/regebro-guido-templates/src/grok/components.py
  U   grok/branches/regebro-guido-templates/src/grok/templatereg.py
  D   grok/branches/regebro-guido-templates/src/grok/tests/view/genshitemplate.py
  D   grok/branches/regebro-guido-templates/src/grok/tests/view/genshitemplate_templates/

-=-
Modified: grok/branches/regebro-guido-templates/src/grok/components.py
===================================================================
--- grok/branches/regebro-guido-templates/src/grok/components.py	2007-10-04 12:48:05 UTC (rev 80604)
+++ grok/branches/regebro-guido-templates/src/grok/components.py	2007-10-04 12:50:12 UTC (rev 80605)
@@ -20,7 +20,6 @@
 import warnings
 import pytz
 import simplejson
-import genshi.template
 
 from zope import component
 from zope import interface
@@ -258,39 +257,7 @@
         namespace['static'] = view.static
         return self.pt_render(namespace)
 
-class GenshiMarkupTemplate(GrokPageTemplate):
-
-    interface.implements(interfaces.ITemplateFile)
     
-    def __init__(self, filename=None, _prefix=None, html=None):
-        if ((html is not None and filename is not None) or
-            (html is None and filename is None)):
-            raise AssertionError("You must pass either html or filename but not both.")
-        
-        if html is not None:
-            self._template = genshi.template.MarkupTemplate(html)
-        else:
-            loader = genshi.template.TemplateLoader(_prefix)
-            self._template = loader.load(filename)
-            
-    
-    def __call__(self, namespace):
-        stream = self._template.generate(**namespace)
-        return stream.render('xhtml')
-    
-    def _factory_init(self, factory):
-        pass
-    
-    def _render_template(self, view):
-        namespace = {}
-        namespace['request'] = view.request
-        namespace['view'] = view
-        namespace['context'] = view.context
-        # XXX need to check whether we really want to put None here if missing
-        namespace['static'] = view.static
-        return self(namespace)
-
-    
 class DirectoryResource(directoryresource.DirectoryResource):
     # We subclass this, because we want to override the default factories for
     # the resources so that .pt and .html do not get created as page

Modified: grok/branches/regebro-guido-templates/src/grok/templatereg.py
===================================================================
--- grok/branches/regebro-guido-templates/src/grok/templatereg.py	2007-10-04 12:48:05 UTC (rev 80604)
+++ grok/branches/regebro-guido-templates/src/grok/templatereg.py	2007-10-04 12:50:12 UTC (rev 80605)
@@ -35,9 +35,6 @@
             if template_file.startswith('.') or template_file.endswith('~'):
                 continue
 
-            #import pdb
-            #pdb.set_trace()
-
             template_name, extension = os.path.splitext(template_file)
             extension = extension[1:] # Get rid of the leading dot.
             template_factory = zope.component.queryUtility(
@@ -82,12 +79,3 @@
     def __call__(self, filename, _prefix=None):
         return grok.components.PageTemplateFile(filename, _prefix)
 
-
-class GenshiMarkupTemplateFileFactory(grok.GlobalUtility):
-    
-    grok.implements(grok.interfaces.ITemplateFactory)
-    grok.name('gmt')
-    
-    def __call__(self, filename, _prefix=None):
-        return grok.components.GenshiMarkupTemplate(filename, _prefix)
-    
\ No newline at end of file

Deleted: grok/branches/regebro-guido-templates/src/grok/tests/view/genshitemplate.py
===================================================================
--- grok/branches/regebro-guido-templates/src/grok/tests/view/genshitemplate.py	2007-10-04 12:48:05 UTC (rev 80604)
+++ grok/branches/regebro-guido-templates/src/grok/tests/view/genshitemplate.py	2007-10-04 12:50:12 UTC (rev 80605)
@@ -1,38 +0,0 @@
-"""
-Templates can also be found in a directory with the same name as the module:
-
-  >>> grok.grok(__name__)
-  
-  >>> manfred = Mammoth()
-  >>> from zope.publisher.browser import TestRequest
-  >>> request = TestRequest()
-  >>> from zope import component
-  >>> view = component.getMultiAdapter((manfred, request), name='cavepainting')
-  >>> print view()
-  <html>
-  <body>
-  A cave painting.
-  </body>
-  </html>
-
-  >>> view = component.getMultiAdapter((manfred, request), name='food')
-  >>> print view()
-  <html>
-  <body>
-  ME GROK EAT MAMMOTH!
-  </body>
-  </html>
-
-"""
-import grok
-
-class Mammoth(grok.Model):
-    pass
-
-class CavePainting(grok.View):
-    pass
-
-class Food(grok.View):
-    
-    def me_do(self):
-        return "ME GROK EAT MAMMOTH!"