summaryrefslogtreecommitdiff
path: root/docs/narr
diff options
context:
space:
mode:
authorAmos Latteier <amos@latteier.com>2016-06-30 10:17:43 -0700
committerAmos Latteier <amos@latteier.com>2016-06-30 10:17:43 -0700
commit35209e4ac53520e1159bd8a6b47128f38a75db18 (patch)
tree85b0f7e8e3794d8980dd10c10b7e57a862e694aa /docs/narr
parent3fd41dcb5a94a73f43862f6d5c063af7b54e6ff3 (diff)
parentbcba92d1b23745d736bdcbc9b799929de382db7b (diff)
downloadpyramid-35209e4ac53520e1159bd8a6b47128f38a75db18.tar.gz
pyramid-35209e4ac53520e1159bd8a6b47128f38a75db18.tar.bz2
pyramid-35209e4ac53520e1159bd8a6b47128f38a75db18.zip
Merge branch 'master' into exception_only
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):