diff options
| author | Bert JW Regeer <bertjw@regeer.org> | 2013-09-06 18:18:49 -0600 |
|---|---|---|
| committer | Bert JW Regeer <bertjw@regeer.org> | 2013-09-06 18:18:49 -0600 |
| commit | d7025fa3c572e4032a2b237904f6fdc42b1da9ec (patch) | |
| tree | 239bca1ad023d924f0b4e6a282b7a37983757e63 | |
| parent | 8e8fc1306b4ee2d1107cf62a8272778f154d53dc (diff) | |
| parent | 90b9686a20e6465b9a97ce02e4d10080c0cf271e (diff) | |
| download | pyramid-d7025fa3c572e4032a2b237904f6fdc42b1da9ec.tar.gz pyramid-d7025fa3c572e4032a2b237904f6fdc42b1da9ec.tar.bz2 pyramid-d7025fa3c572e4032a2b237904f6fdc42b1da9ec.zip | |
Merge branch 'master' into feature/split_chameleon_from_pyramid
Merge in latest changes from master.
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | CHANGES.txt | 9 |
2 files changed, 5 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml index 00c293046..9d4324ff8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ python: - pypy - 3.2 -script: python setup.py test +script: python setup.py test -q notifications: email: diff --git a/CHANGES.txt b/CHANGES.txt index 7d06999d6..6392c7b3b 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -10,11 +10,10 @@ Backwards Incompatibilities - ``request.response`` will no longer be mutated when using the ``pyramid.renderers.render()`` API. Almost all renderers mutate the - ``request.response`` response object (for - example, the JSON renderer sets ``request.response.content_type`` to - ``application/json``), but this is only necessary when the renderer - is called by the view execution machinery; it was a bug when it was - done as a side effect of calling ``pyramid.renderers.render()``. + ``request.response`` response object (for example, the JSON renderer sets + ``request.response.content_type`` to ``application/json``), but this is + only necessary when the renderer is generating a response; it was a bug + when it was done as a side effect of calling ``pyramid.renderers.render()``. 1.5a1 (2013-08-30) ================== |