diff options
| author | Steve Piercy <web@stevepiercy.com> | 2016-04-14 23:10:40 -0700 |
|---|---|---|
| committer | Steve Piercy <web@stevepiercy.com> | 2016-04-14 23:10:40 -0700 |
| commit | 642940cd29203e2e271f72dc866943f447d707e4 (patch) | |
| tree | 4441f87f10771e527ece86ee65103087836d6f73 /docs/whatsnew-1.7.rst | |
| parent | caf65803b79fb05a570af39e5ed90bed7e51e942 (diff) | |
| parent | 3fc6e7fb89c2fcece39f448fd4e3a2c0c54b8439 (diff) | |
| download | pyramid-642940cd29203e2e271f72dc866943f447d707e4.tar.gz pyramid-642940cd29203e2e271f72dc866943f447d707e4.tar.bz2 pyramid-642940cd29203e2e271f72dc866943f447d707e4.zip | |
Merge remote-tracking branch 'upstream/master'
Conflicts:
docs/whatsnew-1.7.rst
Diffstat (limited to 'docs/whatsnew-1.7.rst')
| -rw-r--r-- | docs/whatsnew-1.7.rst | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/docs/whatsnew-1.7.rst b/docs/whatsnew-1.7.rst index 1057b6e72..d202a4140 100644 --- a/docs/whatsnew-1.7.rst +++ b/docs/whatsnew-1.7.rst @@ -54,12 +54,12 @@ Feature Additions See :ref:`auto_csrf_checking` and https://github.com/Pylons/pyramid/pull/2413 -- Pyramid ``HTTPExceptions`` will now take into account the best match for the - clients ``Accept`` header, and depending on what is requested will return - ``text/html``, ``application/json`` or ``text/plain``. The default for - ``*/*`` is still ``text/html``, but if ``application/json`` is explicitly - mentioned it will now receive a valid JSON response. See: - https://github.com/Pylons/pyramid/pull/2489 +- Subclasses of :class:`pyramid.httpexceptions.HTTPException` will now take + into account the best match for the clients ``Accept`` header, and depending + on what is requested will return ``text/html``, ``application/json`` or + ``text/plain``. The default for ``*/*`` is still ``text/html``, but if + ``application/json`` is explicitly mentioned it will now receive a valid + JSON response. See https://github.com/Pylons/pyramid/pull/2489 - A new event, :class:`pyramid.events.BeforeTraversal`, and interface :class:`pyramid.interfaces.IBeforeTraversal` have been introduced that will |