summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2016-04-17 19:50:25 -0500
committerMichael Merickel <michael@merickel.org>2016-04-17 19:51:38 -0500
commitb4ea370131a9b28cd02db3c674d1b4fcdd7ce6d5 (patch)
tree3c83bda83a2996decd880a013f246a120f38367a
parentbdb5708ea929596780d8d37e7e6950ca4ce16043 (diff)
downloadpyramid-b4ea370131a9b28cd02db3c674d1b4fcdd7ce6d5.tar.gz
pyramid-b4ea370131a9b28cd02db3c674d1b4fcdd7ce6d5.tar.bz2
pyramid-b4ea370131a9b28cd02db3c674d1b4fcdd7ce6d5.zip
fix csrf setting error message
-rw-r--r--pyramid/tests/test_viewderivers.py2
-rw-r--r--pyramid/viewderivers.py2
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"')