summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2015-03-15 16:04:52 -0400
committerChris McDonough <chrism@plope.com>2015-03-15 16:04:52 -0400
commit45aa696cf2e90a201eeb5b9d3c90ab0be820d459 (patch)
tree05ebae7a09a78f080a6f0ebf992e563a0aa8be82
parent8ebde50fdc7322e82b96ad103ab168b92ca2b74a (diff)
parent8943131aa7678d26ef7cdd135001a54828c349d6 (diff)
downloadpyramid-45aa696cf2e90a201eeb5b9d3c90ab0be820d459.tar.gz
pyramid-45aa696cf2e90a201eeb5b9d3c90ab0be820d459.tar.bz2
pyramid-45aa696cf2e90a201eeb5b9d3c90ab0be820d459.zip
Merge branch 'master' of github.com:Pylons/pyramid
-rw-r--r--docs/tutorials/wiki/authorization.rst4
-rw-r--r--pyramid/view.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/docs/tutorials/wiki/authorization.rst b/docs/tutorials/wiki/authorization.rst
index 93cd0c18e..6c98b6f3a 100644
--- a/docs/tutorials/wiki/authorization.rst
+++ b/docs/tutorials/wiki/authorization.rst
@@ -197,9 +197,9 @@ Add the following import statements to the
head of ``tutorial/tutorial/views.py``:
.. literalinclude:: src/authorization/tutorial/views.py
- :lines: 6-13,15-17
+ :lines: 6-17
:linenos:
- :emphasize-lines: 3,6-9,11
+ :emphasize-lines: 3,6-11
:language: python
(Only the highlighted lines, with other necessary modifications,
diff --git a/pyramid/view.py b/pyramid/view.py
index 02ac8849f..f48592e16 100644
--- a/pyramid/view.py
+++ b/pyramid/view.py
@@ -380,7 +380,7 @@ class forbidden_view_config(object):
@forbidden_view_config()
def forbidden(request):
- return Response('You are not allowed', status='401 Unauthorized')
+ return Response('You are not allowed', status='403 Forbidden')
All arguments passed to this function have the same meaning as
:meth:`pyramid.view.view_config` and each predicate argument restricts