diff options
| author | Bert JW Regeer <bertjw@regeer.org> | 2015-10-15 23:11:20 -0600 |
|---|---|---|
| committer | Bert JW Regeer <bertjw@regeer.org> | 2015-10-20 23:21:26 -0600 |
| commit | bd67987ae2146c5a8fcddc6089b5137c6d41ebb5 (patch) | |
| tree | 1fbe54a3bb76e1b956e56efd5843e27093aa07bf | |
| parent | 6de9907e82276e34d86aa6f6fe51274e9a18ae18 (diff) | |
| download | pyramid-bd67987ae2146c5a8fcddc6089b5137c6d41ebb5.tar.gz pyramid-bd67987ae2146c5a8fcddc6089b5137c6d41ebb5.tar.bz2 pyramid-bd67987ae2146c5a8fcddc6089b5137c6d41ebb5.zip | |
Autowrap all derivations
| -rw-r--r-- | pyramid/config/derivations.py | 9 | ||||
| -rw-r--r-- | pyramid/config/views.py | 3 |
2 files changed, 2 insertions, 10 deletions
diff --git a/pyramid/config/derivations.py b/pyramid/config/derivations.py index 689b36216..b163bf12a 100644 --- a/pyramid/config/derivations.py +++ b/pyramid/config/derivations.py @@ -193,7 +193,6 @@ def preserve_view_attrs(view, wrapper): return wrapper -@wraps_view def mapped_view(view, default, **kw): mapper = kw.get('mapper') if mapper is None: @@ -206,7 +205,6 @@ def mapped_view(view, default, **kw): mapped_view = mapper(**kw)(view) return mapped_view -@wraps_view def owrapped_view(view, default, **kw): wrapper_viewname = kw.get('wrapper_viewname') viewname = kw.get('viewname') @@ -226,7 +224,6 @@ def owrapped_view(view, default, **kw): return wrapped_response return _owrapped_view -@wraps_view def http_cached_view(view, default, **kw): if kw['registry'].settings.get('prevent_http_cache', False): return view @@ -256,7 +253,6 @@ def http_cached_view(view, default, **kw): return wrapper -@wraps_view def secured_view(view, default, **kw): permission = kw.get('permission') if permission == NO_PERMISSION_REQUIRED: @@ -289,7 +285,6 @@ def secured_view(view, default, **kw): return wrapped_view -@wraps_view def authdebug_view(view, default, **kw): wrapped_view = view settings = kw['registry'].settings @@ -327,7 +322,6 @@ def authdebug_view(view, default, **kw): return wrapped_view -@wraps_view def predicated_view(view, default, **kw): preds = kw.get('predicates', ()) if not preds: @@ -347,7 +341,6 @@ def predicated_view(view, default, **kw): predicate_wrapper.__predicates__ = preds return predicate_wrapper -@wraps_view def attr_wrapped_view(view, default, **kw): kw = kw accept, order, phash = (kw.get('accept', None), @@ -371,7 +364,6 @@ def attr_wrapped_view(view, default, **kw): attr_view.__permission__ = kw.get('permission') return attr_view -@wraps_view def rendered_view(view, default, **kw): # one way or another this wrapper must produce a Response (unless # the renderer is a NullRendererHelper) @@ -440,7 +432,6 @@ def rendered_view(view, default, **kw): return rendered_view -@wraps_view def decorated_view(view, default, **kw): decorator = kw.get('decorator') if decorator is None: diff --git a/pyramid/config/views.py b/pyramid/config/views.py index b085ef35e..450c77dfd 100644 --- a/pyramid/config/views.py +++ b/pyramid/config/views.py @@ -79,6 +79,7 @@ from pyramid.config.derivations import ( view_description, requestonly, DefaultViewMapper, + wraps_view, ) from pyramid.config.util import ( @@ -1020,7 +1021,7 @@ class ViewsConfiguratorMixin(object): derivers = self.registry.queryUtility(IViewDerivers, default=[]) for name, val in inner_derivers + derivers.sorted(): derivation, default = val - view = derivation(view, default, **kw) + view = wraps_view(derivation)(view, default, **kw) return view @action_method |