From 470737a5f5a7d86b809b260b9dbc09f266d4b69c Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@agendaless.com>
Date: Wed, 16 Sep 2009 18:25:31 +0000
Subject: - The ``repoze.bfg.testing.registerDummyRenderer`` API has been  
 deprecated in favor of   ``repoze.bfg.testing.registerTemplateRenderer``.  A
 deprecation   warning is *not* issued at import time for the former name; it
 will   exist "forever".

- The ``repoze.bfg.templating.renderer_from_cache`` function has been
  moved to ``repoze.bfg.renderer.template_renderer_factory``.  This
  was never an API, but code in the wild was spotted that used it.  A
  deprecation warning is issued at import time for the former.

- Better error message when a wrapper view returns None.
---
 repoze/bfg/testing.py | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

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

diff --git a/repoze/bfg/testing.py b/repoze/bfg/testing.py
index bdf60de40..7b694b242 100644
--- a/repoze/bfg/testing.py
+++ b/repoze/bfg/testing.py
@@ -69,11 +69,11 @@ def registerEventListener(event_iface=Interface):
     registerSubscriber(subscriber, event_iface)
     return L
 
-def registerDummyRenderer(path, renderer=None):
-    """ Register a 'renderer' at ``path`` (usually a relative filename
-    ala ``templates/foo.pt``) and return the renderer object.  If the
-    ``renderer`` argument is None, a 'dummy' renderer will be used.
-    This function is useful when testing code that calls the
+def registerTemplateRenderer(path, renderer=None):
+    """ Register a 'template renderer' at ``path`` (usually a relative
+    filename ala ``templates/foo.pt``) and return the renderer object.
+    If the ``renderer`` argument is None, a 'dummy' renderer will be
+    used.  This function is useful when testing code that calls the
     ``render_template_to_response`` or any other ``render_template*``
     API of any of the built-in templating systems."""
     from repoze.bfg.interfaces import ITemplateRenderer
@@ -81,6 +81,10 @@ def registerDummyRenderer(path, renderer=None):
         renderer = DummyTemplateRenderer()
     return registerUtility(renderer, ITemplateRenderer, path)
 
+# registerDummyRenderer is a deprecated alias that should never be removed
+# (far too much usage in the wild)
+registerDummyRenderer = registerTemplateRenderer
+
 def registerView(name, result='', view=None, for_=(Interface, Interface),
                  permission=None):
     """ Registers ``repoze.bfg`` view function under the name
@@ -251,7 +255,7 @@ class DummySecurityPolicy:
 class DummyTemplateRenderer:
     """
     An instance of this class is returned from
-    ``registerDummyRenderer``.  It has a helper function (``assert_``)
+    ``registerTemplateRenderer``.  It has a helper function (``assert_``)
     that makes it possible to make an assertion which compares data
     passed to the renderer by the view function against expected
     key/value pairs. 
-- 
cgit v1.2.3