svn merge -r9909:HEAD $REPOZE_SVN/repoze.bfg/branches/rendererhelper

1 files changed, 10 insertions, 5 deletions

diff --git a/repoze/bfg/chameleon_text.py b/repoze/bfg/chameleon_text.py
index bbf15ead1..cdfda93f4 100644
--- a/repoze/bfg/chameleon_text.py
+++ b/repoze/bfg/chameleon_text.py
@@ -86,7 +86,8 @@ def get_renderer(path):
        :func:`repoze.bfg.renderers.get_renderer` instead.
     """
     package = caller_package()
-    return renderers.renderer_from_name(path, package)
+    factory = renderers.RendererHelper(path, package=package)
+    return factory.get_renderer()
 
 def get_template(path):
     """ Return the underyling object representing a :term:`Chameleon`
@@ -99,8 +100,8 @@ def get_template(path):
        :func:`repoze.bfg.renderers.get_renderer` instead.
     """
     package = caller_package()
-    renderer = renderers.renderer_from_name(path, package)
-    return renderer.implementation()
+    factory = renderers.RendererHelper(path, package=package)
+    return factory.get_renderer().implementation()
 
 def render_template(path, **kw):
     """ Render a :term:`Chameleon` text template using the template
@@ -114,7 +115,9 @@ def render_template(path, **kw):
        :func:`repoze.bfg.renderers.render` instead.
     """
     package = caller_package()
-    return renderers._render(path, None, kw, {}, None, package)
+    request = kw.pop('request', None)
+    renderer = renderers.RendererHelper(path, package=package)
+    return renderer.render(kw, None, request=request)
 
 def render_template_to_response(path, **kw):
     """ Render a :term:`Chameleon` text template using the template
@@ -129,4 +132,6 @@ def render_template_to_response(path, **kw):
        :func:`repoze.bfg.renderers.render_to_response` instead.
     """
     package = caller_package()
-    return renderers._render_to_response(path, None, kw, {}, None, package)
+    request = kw.pop('request', None)
+    renderer = renderers.RendererHelper(path, package=package)
+    return renderer.render_to_response(kw, None, request=request)