Merge branch 'requestresponse'

1 files changed, 33 insertions, 0 deletions

diff --git a/CHANGES.txt b/CHANGES.txt
index 66103fbc1..83d71e2b7 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,39 @@
 Next release
 ============
 
+Requestresponse branch
+----------------------
+
+- Deprecated all assignments to ``request.response_*`` attributes (for
+  example ``request.response_content_type = 'foo'`` is now deprecated).
+  Assignments and mutations of the following assignable request attributes
+  that were considered by the framework for response influence are now
+  deprecated: ``response_content_type``, ``response_headerlist``,
+  ``response_status``, ``response_charset``, and ``response_cache_for``.
+  Instead of assigning these to the request object for later detection by the
+  rendering machinery, users should use the appropriate API of the Response
+  object created by accessing ``request.response`` (e.g. code which does
+  ``request.response_content_type = 'abc'`` should be changed to
+  ``request.response.content_type = 'abc'``).
+
+- A custom request factory is now required to return a response object that
+  has a ``response`` attribute (or "reified"/lazy property) if they the
+  request is meant to be used in a view that uses a renderer.  This
+  ``response`` attribute should be an instance of the class
+  ``pyramid.response.Response``.
+
+- The JSON and string renderer factories now assign to
+  ``request.response.content_type`` rather than
+  ``request.response_content_type``.  Each renderer factory adetermines
+  whether it should change the content type of the response by comparing the
+  response's content type against the response's default content type; if the
+  content type is not the default content type (usually ``text/html``), the
+  renderer changes the content type (to ``application/json`` or
+  ``text/plain`` for JSON and string renderers respectively).
+
+- Made it possible to assign to and delete
+  ``pyramid.testing.DummyRequest.registry`` (bugfix).
+
 Documentation
 -------------