From 04e182bbc0c077afcd921f0df4231020549dc217 Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@agendaless.com>
Date: Mon, 14 Sep 2009 04:33:38 +0000
Subject: - A ZCML ``view`` directive (and the associated ``bfg_view``  
 decorator) can now accept an "attr" value.  If an "attr" value is   supplied,
 it is considered a method named of the view object to be   called when the
 response is required.  This is typically only good   for views that are
 classes or instances (not so useful for   functions, as functions typically
 have no methods other than   ``__call__``).

- A ZCML ``view`` directive (and the associated ``bfg_view``
  decorator) can now accept a "template" value.  If a "template" value
  is supplied, and the view callable returns a dictionary, the
  associated template is rendered with the dictionary as keyword
  arguments.
---
 repoze/bfg/chameleon_text.py | 43 ++-----------------------------------------
 1 file changed, 2 insertions(+), 41 deletions(-)

(limited to 'repoze/bfg/chameleon_text.py')

diff --git a/repoze/bfg/chameleon_text.py b/repoze/bfg/chameleon_text.py
index 453328d9c..f482d795f 100644
--- a/repoze/bfg/chameleon_text.py
+++ b/repoze/bfg/chameleon_text.py
@@ -2,50 +2,11 @@ from webob import Response
 
 from zope.component import queryUtility
 
-from zope.interface import classProvides
-from zope.interface import implements
-
 from repoze.bfg.interfaces import IResponseFactory
-from repoze.bfg.interfaces import ITemplateRenderer
-from repoze.bfg.interfaces import ITemplateRendererFactory
-from repoze.bfg.interfaces import ISettings
 
 from repoze.bfg.templating import renderer_from_cache
-
-from chameleon.core.template import TemplateFile
-from chameleon.zpt.language import Parser
-
-class TextTemplateFile(TemplateFile):
-    default_parser = Parser()
-    
-    def __init__(self, filename, parser=None, format=None,
-                 doctype=None, **kwargs):
-        if parser is None:
-            parser = self.default_parser
-        super(TextTemplateFile, self).__init__(filename, parser, format,
-                                               doctype, **kwargs)
-
-class TextTemplateRenderer(object):
-    classProvides(ITemplateRendererFactory)
-    implements(ITemplateRenderer)
-
-    def __init__(self, path, auto_reload=False):
-        self.template = TextTemplateFile(
-            path,
-            format='text',
-            auto_reload=auto_reload
-            )
-
-    def implementation(self):
-        return self.template
-    
-    def __call__(self, **kw):
-        return self.template(**kw)
-
-def _auto_reload():
-    settings = queryUtility(ISettings)
-    auto_reload = settings and settings.reload_templates
-    return auto_reload
+from repoze.bfg.templating import TextTemplateRenderer
+from repoze.bfg.templating import _auto_reload
 
 def get_renderer(path):
     """ Return a callable ``ITemplateRenderer`` object representing a
-- 
cgit v1.2.3