summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2017-04-30 19:09:17 -0500
committerMichael Merickel <michael@merickel.org>2017-04-30 19:09:17 -0500
commit9028c99445d4c0a7ac24aaa84a6db499397e691a (patch)
treed9cc28032178f4840d26be705c7e614dee891c70
parent6419a30f2322157a1faf3fce5bec5122a2ca69fa (diff)
downloadpyramid-9028c99445d4c0a7ac24aaa84a6db499397e691a.tar.gz
pyramid-9028c99445d4c0a7ac24aaa84a6db499397e691a.tar.bz2
pyramid-9028c99445d4c0a7ac24aaa84a6db499397e691a.zip
move csrf changes to the "major features" section
-rw-r--r--CHANGES.txt34
1 files changed, 17 insertions, 17 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index 719fbd495..bcfcc3107 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -26,23 +26,6 @@ Major Features
See https://github.com/Pylons/pyramid/pull/2964
-Features
---------
-
-- Support an ``open_url`` config setting in the ``pserve`` section of the
- config file. This url is used to open a web browser when ``pserve --browser``
- is invoked. When this setting is unavailable the ``pserve`` script will
- attempt to guess the port the server is using from the
- ``server:<server_name>`` section of the config file but there is no
- requirement that the server is being run in this format so it may fail.
- See https://github.com/Pylons/pyramid/pull/2984
-
-- The threadlocals are now available inside any function invoked via
- ``config.include``. This means the only config-time code that cannot rely
- on threadlocals is code executed from non-actions inside the main. This
- can be alleviated by invoking ``config.begin()`` and ``config.end()``
- appropriately. See https://github.com/Pylons/pyramid/pull/2989
-
- CSRF support has been refactored out of sessions and into its own
independent API in the ``pyramid.csrf`` module. It supports a pluggable
``pyramid.interfaces.ICSRFStoragePolicy`` which can be used to define your
@@ -66,6 +49,23 @@ Features
See https://github.com/Pylons/pyramid/pull/2854 and
https://github.com/Pylons/pyramid/pull/3019
+Features
+--------
+
+- Support an ``open_url`` config setting in the ``pserve`` section of the
+ config file. This url is used to open a web browser when ``pserve --browser``
+ is invoked. When this setting is unavailable the ``pserve`` script will
+ attempt to guess the port the server is using from the
+ ``server:<server_name>`` section of the config file but there is no
+ requirement that the server is being run in this format so it may fail.
+ See https://github.com/Pylons/pyramid/pull/2984
+
+- The threadlocals are now available inside any function invoked via
+ ``config.include``. This means the only config-time code that cannot rely
+ on threadlocals is code executed from non-actions inside the main. This
+ can be alleviated by invoking ``config.begin()`` and ``config.end()``
+ appropriately. See https://github.com/Pylons/pyramid/pull/2989
+
- The ``pyramid.config.Configurator`` can now be used as a context manager
which will automatically push/pop threadlocals (similar to
``config.begin()`` and ``config.end()``). It will also automatically perform