summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Piercy <web@stevepiercy.com>2016-01-27 23:56:40 -0800
committerSteve Piercy <web@stevepiercy.com>2016-01-27 23:56:40 -0800
commit02cb9959943d1c862b7b119c16289df280b3ac1f (patch)
tree4bfea48ad39146b82f068961ecfff1826e548eef
parentfe1135e05aca83cd260be391546827ef55acf0d2 (diff)
parentef01de3970ecaabc7fbabbbd461adcada2997254 (diff)
downloadpyramid-02cb9959943d1c862b7b119c16289df280b3ac1f.tar.gz
pyramid-02cb9959943d1c862b7b119c16289df280b3ac1f.tar.bz2
pyramid-02cb9959943d1c862b7b119c16289df280b3ac1f.zip
Merge pull request #2293 from hyperknot/patch-1
check_csrf vs. csrf_token in view_config docs
-rw-r--r--pyramid/view.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/pyramid/view.py b/pyramid/view.py
index 2867e3d6f..7e8996ca4 100644
--- a/pyramid/view.py
+++ b/pyramid/view.py
@@ -165,7 +165,7 @@ class view_config(object):
``request_type``, ``route_name``, ``request_method``, ``request_param``,
``containment``, ``xhr``, ``accept``, ``header``, ``path_info``,
``custom_predicates``, ``decorator``, ``mapper``, ``http_cache``,
- ``match_param``, ``csrf_token``, ``physical_path``, and ``predicates``.
+ ``match_param``, ``check_csrf``, ``physical_path``, and ``predicates``.
The meanings of these arguments are the same as the arguments passed to
:meth:`pyramid.config.Configurator.add_view`. If any argument is left