summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2012-11-04 19:10:16 -0600
committerMichael Merickel <michael@merickel.org>2012-11-04 19:16:43 -0600
commit170124352a495438ef689d3376988bc8aefa8876 (patch)
tree35597243ce24d9b45bdd6a725bf4d68964a2358b
parentab7860c89ecdeb92819a8717edcc12baa45d4fb9 (diff)
downloadpyramid-170124352a495438ef689d3376988bc8aefa8876.tar.gz
pyramid-170124352a495438ef689d3376988bc8aefa8876.tar.bz2
pyramid-170124352a495438ef689d3376988bc8aefa8876.zip
update changelog, close #627
-rw-r--r--CHANGES.txt5
-rw-r--r--pyramid/config/views.py2
2 files changed, 7 insertions, 0 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index 5175baa5a..d57444ad0 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -37,6 +37,11 @@ Features
permit limited composition reuse of the decorator by other software that
wants to provide custom decorators that are much like view_config.
+- Allow an iterable of decorators to be passed to
+ ``pyramid.config.Configurator.add_view``. This allows views to be wrapped
+ by more than one decorator without requiring combining the decorators
+ yourself.
+
Bug Fixes
---------
diff --git a/pyramid/config/views.py b/pyramid/config/views.py
index 0cd61cba5..10f972633 100644
--- a/pyramid/config/views.py
+++ b/pyramid/config/views.py
@@ -868,6 +868,8 @@ class ViewsConfiguratorMixin(object):
think about preserving function attributes such as ``__name__`` and
``__module__`` within decorator logic).
+ Passing an iterable is only supported as of :app:`Pyramid` 1.4a4.
+
mapper
A Python object or :term:`dotted Python name` which refers to a