Fix bug in dummy renderer "implementation" method.

Provide a b/c shim for the "templating" module (code in the wild imports).

4 files changed, 26 insertions, 5 deletions

diff --git a/repoze/bfg/renderers.py b/repoze/bfg/renderers.py
index 495a35541..503131400 100644
--- a/repoze/bfg/renderers.py
+++ b/repoze/bfg/renderers.py
@@ -76,7 +76,7 @@ def renderer_from_name(path, level=4):
 
 def _reload_resources():
     settings = get_settings()
-    if settings:
-        return settings['reload_resources']
-    return False
+    return settings and settings.get('reload_resources')
+
+
 
diff --git a/repoze/bfg/templating.py b/repoze/bfg/templating.py
new file mode 100644
index 000000000..c86c88ddd
--- /dev/null
+++ b/repoze/bfg/templating.py
@@ -0,0 +1,16 @@
+from zope.deprecation import deprecated
+
+from repoze.bfg.renderers import template_renderer_factory
+
+deprecated('renderer_from_cache',
+           'The repoze.bfg.templating.renderer_from_cache function has '
+           'been deprecated.  As of repoze.bfg version 1.1, you should use the '
+           'repoze.bfg.renderers.template_renderer_factory function instead. '
+           'Note however that neither the "renderer_from_cache" function '
+           'nor the "template_renderer_factory" function is a documented '
+           'BFG API.  You shouldn\'t be importing either of these unless '
+           'you are willing to deal with incompatibilities introduced in '
+           'future BFG versions.')
+
+def renderer_from_cache(path, impl, level=4, **kw):
+    return template_renderer_factory(path, impl, level)
diff --git a/repoze/bfg/testing.py b/repoze/bfg/testing.py
index 8fbeb6012..bdf60de40 100644
--- a/repoze/bfg/testing.py
+++ b/repoze/bfg/testing.py
@@ -262,7 +262,9 @@ class DummyTemplateRenderer:
         self.string_response = string_response
         
     def implementation(self):
-        return self
+        def callit(**kw):
+            return self(kw)
+        return callit
     
     def __call__(self, kw):
         self._received.update(kw)
diff --git a/repoze/bfg/tests/test_testing.py b/repoze/bfg/tests/test_testing.py
index 9ebd8468a..f479106ce 100644
--- a/repoze/bfg/tests/test_testing.py
+++ b/repoze/bfg/tests/test_testing.py
@@ -456,7 +456,10 @@ class TestDummyTemplateRenderer(unittest.TestCase):
 
     def test_implementation(self):
         renderer = self._makeOne()
-        self.assertEqual(renderer.implementation(), renderer)
+        impl = renderer.implementation()
+        impl(a=1, b=2)
+        self.assertEqual(renderer._received['a'], 1)
+        self.assertEqual(renderer._received['b'], 2)
 
     def test_getattr(self):
         renderer = self._makeOne()