summaryrefslogtreecommitdiff
path: root/docs/narr
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2016-07-01 01:41:42 +0200
committerChris McDonough <chrism@plope.com>2016-07-01 01:41:42 +0200
commitd350714a917b1a06dd4be6092e7b3da64771a4af (patch)
tree80c26cdd036093d312c2017c85eb05f94f19692c /docs/narr
parent88d40ca6a84920d4c36b7a3be1cf3b46a6375f4e (diff)
parentbcba92d1b23745d736bdcbc9b799929de382db7b (diff)
downloadpyramid-d350714a917b1a06dd4be6092e7b3da64771a4af.tar.gz
pyramid-d350714a917b1a06dd4be6092e7b3da64771a4af.tar.bz2
pyramid-d350714a917b1a06dd4be6092e7b3da64771a4af.zip
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs/narr')
-rw-r--r--docs/narr/security.rst8
-rw-r--r--docs/narr/urldispatch.rst2
2 files changed, 9 insertions, 1 deletions
diff --git a/docs/narr/security.rst b/docs/narr/security.rst
index 7cbea113c..77e7fd707 100644
--- a/docs/narr/security.rst
+++ b/docs/narr/security.rst
@@ -290,6 +290,14 @@ properties of the instance.
def __init__(self, owner):
self.owner = owner
+.. warning::
+
+ Writing ``__acl__`` as properties is discouraged because an
+ ``AttributeError`` occurring in ``fget`` or ``fset`` will be silently
+ dismissed (this is consistent with Python ``getattr`` and ``hasattr``
+ behaviors). For dynamic ACLs, simply use callables, as documented above.
+
+
.. index::
single: ACE
single: access control entry
diff --git a/docs/narr/urldispatch.rst b/docs/narr/urldispatch.rst
index 2472ace31..7d37c04df 100644
--- a/docs/narr/urldispatch.rst
+++ b/docs/narr/urldispatch.rst
@@ -557,7 +557,7 @@ Here is an example of a corresponding ``mypackage.views`` module:
@view_config(route_name='idea')
def idea_view(request):
- return Response(request.matchdict['id'])
+ return Response(request.matchdict['idea'])
@view_config(route_name='user')
def user_view(request):