summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-01-22 23:25:30 -0500
committerChris McDonough <chrism@plope.com>2011-01-22 23:25:30 -0500
commit877904ac1b192191b0bdac4f7e4e1cd6d5f27884 (patch)
tree7567deb681ab1ea3c5449d28c6838ec1486c7c6b
parenta87a68d83f713ed3cd81011b486178179e3b413e (diff)
downloadpyramid-877904ac1b192191b0bdac4f7e4e1cd6d5f27884.tar.gz
pyramid-877904ac1b192191b0bdac4f7e4e1cd6d5f27884.tar.bz2
pyramid-877904ac1b192191b0bdac4f7e4e1cd6d5f27884.zip
- 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
-rw-r--r--CHANGES.txt6
-rw-r--r--pyramid/renderers.py2
-rw-r--r--pyramid/tests/test_renderers.py18
3 files changed, 25 insertions, 1 deletions
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):