From 877904ac1b192191b0bdac4f7e4e1cd6d5f27884 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Sat, 22 Jan 2011 23:25:30 -0500 Subject: - The ``render_view`` method of ``pyramid.renderers.RendererHelper`` passed an incorrect value into the renderer for ``renderer_info``. It now passes an instance of ``RendererHelper`` instead of a dictionary, which is consistent with other usages. See https://github.com/Pylons/pyramid/issues#issue/106 Closes #106 --- CHANGES.txt | 6 ++++++ pyramid/renderers.py | 2 +- pyramid/tests/test_renderers.py | 18 ++++++++++++++++++ 3 files changed, 25 insertions(+), 1 deletion(-) diff --git a/CHANGES.txt b/CHANGES.txt index f6093d23f..4f48b2743 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -19,6 +19,12 @@ Bug Fixes start when ``paster serve development.ini`` was used against the result. See https://github.com/Pylons/pyramid/issues/#issue/107 +- The ``render_view`` method of ``pyramid.renderers.RendererHelper`` passed + an incorrect value into the renderer for ``renderer_info``. It now passes + an instance of ``RendererHelper`` instead of a dictionary, which is + consistent with other usages. See + https://github.com/Pylons/pyramid/issues#issue/106 + 1.0b1 (2011-01-21) ================== diff --git a/pyramid/renderers.py b/pyramid/renderers.py index bc3377815..f58595a2c 100644 --- a/pyramid/renderers.py +++ b/pyramid/renderers.py @@ -286,7 +286,7 @@ class RendererHelper(object): system = { 'view':view, 'renderer_name':self.name, # b/c - 'renderer_info':{'name':self.name, 'package':self.package}, + 'renderer_info':self, 'context':context, 'request':request } diff --git a/pyramid/tests/test_renderers.py b/pyramid/tests/test_renderers.py index 9ff9e1274..8711c25e0 100644 --- a/pyramid/tests/test_renderers.py +++ b/pyramid/tests/test_renderers.py @@ -334,6 +334,24 @@ class TestRendererHelper(unittest.TestCase): request=request) self.assertEqual(response.body, ('values', 'system_values')) + def test_render_view(self): + self._registerRendererFactory() + request = Dummy() + helper = self._makeOne('loo.foo') + view = 'view' + context = 'context' + request = testing.DummyRequest() + response = 'response' + response = helper.render_view(request, response, view, context) + self.assertEqual(response.body, + ('response', + {'renderer_info': helper, + 'renderer_name': 'loo.foo', + 'request': request, + 'context': 'context', + 'view': 'view'}) + ) + def test_render_explicit_registry(self): factory = self._registerRendererFactory() class DummyRegistry(object): -- cgit v1.2.3