summaryrefslogtreecommitdiff
path: root/CHANGES.txt
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2013-03-19 08:28:26 -0700
committerChris McDonough <chrism@plope.com>2013-03-19 08:28:26 -0700
commit804c27a1c7fe4fb50224e5d5be163c6f894b990a (patch)
tree4335f960277684b87f99b085a07f7b7deec3fda0 /CHANGES.txt
parent881feb9c25b5c16d05e5ae9f3384eded1231fe59 (diff)
parentaae62a0ba0d4709b50fd5f2e0be86fd91080d014 (diff)
downloadpyramid-804c27a1c7fe4fb50224e5d5be163c6f894b990a.tar.gz
pyramid-804c27a1c7fe4fb50224e5d5be163c6f894b990a.tar.bz2
pyramid-804c27a1c7fe4fb50224e5d5be163c6f894b990a.zip
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'CHANGES.txt')
-rw-r--r--CHANGES.txt13
1 files changed, 13 insertions, 0 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index 85dd3be2a..ae2cafba4 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,16 @@
+next release
+============
+
+Features
+--------
+
+- ``ACLAuthorizationPolicy`` supports ``__acl__`` as a callable. This
+ removes the ambiguity between the potential ``AttributeError`` that would
+ be raised on the ``context`` when the property was not defined and the
+ ``AttributeError`` that could be raised from any user-defined code within
+ a dynamic property. It is recommended to define a dynamic ACL as a callable
+ to avoid this ambiguity. See https://github.com/Pylons/pyramid/issues/735.
+
1.4 (2012-12-18)
================