From b4ea370131a9b28cd02db3c674d1b4fcdd7ce6d5 Mon Sep 17 00:00:00 2001 From: Michael Merickel Date: Sun, 17 Apr 2016 19:50:25 -0500 Subject: fix csrf setting error message --- pyramid/tests/test_viewderivers.py | 2 +- pyramid/viewderivers.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pyramid/tests/test_viewderivers.py b/pyramid/tests/test_viewderivers.py index 6bfe353e5..ae02e0152 100644 --- a/pyramid/tests/test_viewderivers.py +++ b/pyramid/tests/test_viewderivers.py @@ -1108,7 +1108,7 @@ class TestDeriveView(unittest.TestCase): self.config._derive_view(view) except ConfigurationError as ex: self.assertEqual( - 'Config setting "pyramid.require_csrf_default" must be a ' + 'Config setting "pyramid.require_default_csrf" must be a ' 'string or boolean value', ex.args[0]) else: # pragma: no cover diff --git a/pyramid/viewderivers.py b/pyramid/viewderivers.py index d5a5c480a..d9d9c2904 100644 --- a/pyramid/viewderivers.py +++ b/pyramid/viewderivers.py @@ -482,7 +482,7 @@ SAFE_REQUEST_METHODS = frozenset(["GET", "HEAD", "OPTIONS", "TRACE"]) def csrf_view(view, info): default_val = _parse_csrf_setting( info.settings.get('pyramid.require_default_csrf'), - 'Config setting "pyramid.require_csrf_default"') + 'Config setting "pyramid.require_default_csrf"') val = _parse_csrf_setting( info.options.get('require_csrf'), 'View option "require_csrf"') -- cgit v1.2.3