diff options
| author | Michael Merickel <michael@merickel.org> | 2018-06-11 00:59:47 -0500 |
|---|---|---|
| committer | Michael Merickel <michael@merickel.org> | 2018-06-11 00:59:47 -0500 |
| commit | 34bbcc83ddb9052f803c62eaedbe7308809d9416 (patch) | |
| tree | bbbef8a36a0bc6ee07545737f94f7505c5e8d232 | |
| parent | 57ee91a9f0e3769a725280c3db351fb466bd7431 (diff) | |
| parent | aaed8d498ae255c27109e0b40736ca93ed7a4093 (diff) | |
| download | pyramid-34bbcc83ddb9052f803c62eaedbe7308809d9416.tar.gz pyramid-34bbcc83ddb9052f803c62eaedbe7308809d9416.tar.bz2 pyramid-34bbcc83ddb9052f803c62eaedbe7308809d9416.zip | |
Merge branch 'master' into feature/session-samesite-lax
| -rw-r--r-- | CHANGES.rst | 11 | ||||
| -rw-r--r-- | pyramid/config/routes.py | 1 |
2 files changed, 8 insertions, 4 deletions
diff --git a/CHANGES.rst b/CHANGES.rst index 7c442aa1a..aeb7c3f9a 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -40,9 +40,9 @@ Features Bug Fixes --------- -- Set appropriate ``code`` and ``title`` attributes on the ``HTTPClientError`` and - ``HTTPServerError`` exception classes. This prevents inadvertently returning a 520 - error code. +- Set appropriate ``code`` and ``title`` attributes on the ``HTTPClientError`` + and ``HTTPServerError`` exception classes. This prevents inadvertently + returning a 520 error code. See https://github.com/Pylons/pyramid/pull/3280 - Replace ``webob.acceptparse.MIMEAccept`` from WebOb with @@ -61,6 +61,11 @@ Backward Incompatibilities depending on it directly within your project. See https://github.com/Pylons/pyramid/pull/3140 +- Remove the ``permission`` argument from + ``pyramid.config.Configurator.add_route``. This was an argument left over + from a feature removed in Pyramid 1.5 and has had no effect since then. + See https://github.com/Pylons/pyramid/pull/3299 + - Modify the builtin session implementations to set ``SameSite='Lax'`` on cookies. This affects ``pyramid.session.BaseCookieSessionFactory``, ``pyramid.session.SignedCookieSessionFactory``, and diff --git a/pyramid/config/routes.py b/pyramid/config/routes.py index 598af300f..b00886e5d 100644 --- a/pyramid/config/routes.py +++ b/pyramid/config/routes.py @@ -24,7 +24,6 @@ class RoutesConfiguratorMixin(object): def add_route(self, name, pattern=None, - permission=None, factory=None, for_=None, header=None, |