From c0fdece49783285958694442abd511efec524537 Mon Sep 17 00:00:00 2001 From: Tim Tisdall Date: Wed, 15 Apr 2015 15:08:57 +0000 Subject: mention adding links in whatsnew for minor revs --- RELEASING.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/RELEASING.txt b/RELEASING.txt index 553d2dcf2..9f085d7f4 100644 --- a/RELEASING.txt +++ b/RELEASING.txt @@ -24,7 +24,9 @@ Releasing Pyramid communicate with contributors). - Copy relevant changes (delta bug fixes) from CHANGES.txt to - docs/whatsnew-X.X (if it's a major release). + docs/whatsnew-X.X (if it's a major release). Minor releases should + include a link under "Bug Fix Releases" to the minor feature + changes in CHANGES.txt . - Make sure docs render OK:: -- cgit v1.2.3 From 875b90d3376c060dea469bc7110c51e20b2eee0a Mon Sep 17 00:00:00 2001 From: Jeff Dairiki Date: Wed, 15 Apr 2015 12:12:19 -0700 Subject: Add tests for temporary_response context manager These tests test for, among other things, the nits described in comments on #1563, namely: - ``Request.response`` should be restored even if the renderer raises an exception - If ``request.response`` is initially set to ``None``, it should be restored to ``None`` (rather than deleted). (Some of these tests currently fail.) --- pyramid/tests/test_renderers.py | 42 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/pyramid/tests/test_renderers.py b/pyramid/tests/test_renderers.py index ed6344a40..542eea9aa 100644 --- a/pyramid/tests/test_renderers.py +++ b/pyramid/tests/test_renderers.py @@ -592,6 +592,48 @@ class Test_render_to_response(unittest.TestCase): self.assertEqual(result.body, b'{"a": 1}') self.assertFalse('response' in request.__dict__) +class Test_temporary_response(unittest.TestCase): + def _callFUT(self, request): + from pyramid.renderers import temporary_response + return temporary_response(request) + + def test_restores_response(self): + request = testing.DummyRequest() + orig_response = request.response + with self._callFUT(request): + request.response = object() + self.assertEqual(request.response, orig_response) + + def test_restores_response_on_exception(self): + request = testing.DummyRequest() + orig_response = request.response + try: + with self._callFUT(request): + request.response = object() + raise RuntimeError() + except RuntimeError: + self.assertEqual(request.response, orig_response) + else: # pragma: no cover + self.fail("RuntimeError not raised") + + def test_restores_response_to_none(self): + request = testing.DummyRequest(response=None) + with self._callFUT(request): + request.response = object() + self.assertEqual(request.response, None) + + def test_deletes_response(self): + request = testing.DummyRequest() + with self._callFUT(request): + request.response = object() + self.assertTrue('response' not in request.__dict__) + + def test_does_not_delete_response_if_no_response_to_delete(self): + request = testing.DummyRequest() + with self._callFUT(request): + pass + self.assertTrue('response' not in request.__dict__) + class Test_get_renderer(unittest.TestCase): def setUp(self): self.config = testing.setUp() -- cgit v1.2.3 From 957e7c3e0b9a86ae83e4e2a106144c4a310a4919 Mon Sep 17 00:00:00 2001 From: Jeff Dairiki Date: Wed, 15 Apr 2015 12:18:53 -0700 Subject: Restore request.response if renderer raises exception This fixes two bugs in the ``temporary_response`` context manager: - ``Request.response`` should be restored even if the renderer raises an exception - If ``request.response`` is initially set to ``None``, it should be restored to ``None`` (rather than deleted). References: #1563 --- pyramid/renderers.py | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/pyramid/renderers.py b/pyramid/renderers.py index 088d451bb..de0b1d27f 100644 --- a/pyramid/renderers.py +++ b/pyramid/renderers.py @@ -142,25 +142,22 @@ def render_to_response(renderer_name, return result +_marker = object() + @contextlib.contextmanager def temporary_response(request): """ Temporarily delete request.response and restore it afterward. """ - saved_response = None - # save the current response, preventing the renderer from affecting it attrs = request.__dict__ if request is not None else {} - if 'response' in attrs: - saved_response = attrs['response'] - del attrs['response'] - - yield - - # restore the original response, overwriting any changes - if saved_response is not None: - attrs['response'] = saved_response - elif 'response' in attrs: - del attrs['response'] + saved_response = attrs.pop('response', _marker) + try: + yield + finally: + if saved_response is not _marker: + attrs['response'] = saved_response + elif 'response' in attrs: + del attrs['response'] def get_renderer(renderer_name, package=None): """ Return the renderer object for the renderer ``renderer_name``. -- cgit v1.2.3 From 84ccda73c3b4c19c299c17f918678c5e0d181c16 Mon Sep 17 00:00:00 2001 From: Steve Piercy Date: Wed, 15 Apr 2015 17:58:32 -0400 Subject: Add pylonshq and pylonsrtd items to update --- RELEASING.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/RELEASING.txt b/RELEASING.txt index 571b7f76c..87ff62c53 100644 --- a/RELEASING.txt +++ b/RELEASING.txt @@ -51,6 +51,12 @@ Releasing Pyramid $ python setup.py sdist bdist_wheel $ twine upload dist/pyramid-X.X-* +- Edit Pylons/pylonshq/templates/home/home.mako for minor and major updates. + +- Edit Pylons/pylonshq/templates/home/inside.rst for major updates only. + +- Edit Pylons/pylonsrtd/pylonsrtd/docs/pyramid.rst for all updates. + - Edit `http://wiki.python.org/moin/WebFrameworks `_. -- cgit v1.2.3