summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBert JW Regeer <bertjw@regeer.org>2015-10-15 23:33:19 -0600
committerBert JW Regeer <bertjw@regeer.org>2015-10-20 23:21:26 -0600
commit3a20b74382c920638418a72789ed7d75b085b2d6 (patch)
tree683406436b4f7ca47efcc05db639745537c3cc3f
parentbd67987ae2146c5a8fcddc6089b5137c6d41ebb5 (diff)
downloadpyramid-3a20b74382c920638418a72789ed7d75b085b2d6.tar.gz
pyramid-3a20b74382c920638418a72789ed7d75b085b2d6.tar.bz2
pyramid-3a20b74382c920638418a72789ed7d75b085b2d6.zip
There are two view derivations we can't do without
Specifically predicated_view and attr_wrapped_view exist for MultiView to function, without them the view machinery doesn't work. They aren't technically view derivations because they are just containers for some data that the view machinery requires.
-rw-r--r--pyramid/config/views.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/pyramid/config/views.py b/pyramid/config/views.py
index 450c77dfd..a09654330 100644
--- a/pyramid/config/views.py
+++ b/pyramid/config/views.py
@@ -1018,8 +1018,11 @@ class ViewsConfiguratorMixin(object):
inner_derivers = [('mapped_view', (d.mapped_view, None)),
('rendered_view', (d.rendered_view, None))]
+ outer_derivers = [('predicated_view', (d.predicated_view, None)),
+ ('attr_wrapped_view', (d.attr_wrapped_view, None)),]
+
derivers = self.registry.queryUtility(IViewDerivers, default=[])
- for name, val in inner_derivers + derivers.sorted():
+ for name, val in inner_derivers + derivers.sorted() + outer_derivers:
derivation, default = val
view = wraps_view(derivation)(view, default, **kw)
return view
@@ -1105,8 +1108,6 @@ class ViewsConfiguratorMixin(object):
('owrapped_view', d.owrapped_view),
('secured_view', d.secured_view),
('authdebug_view', d.authdebug_view),
- ('predicated_view', d.predicated_view),
- ('attr_wrapped_view', d.attr_wrapped_view),
]
after = pyramid.util.FIRST
for name, deriver in derivers: