diff options
| author | Michael Merickel <michael@merickel.org> | 2016-03-08 23:45:12 -0600 |
|---|---|---|
| committer | Michael Merickel <michael@merickel.org> | 2016-03-08 23:45:12 -0600 |
| commit | e292cca8a2f07090697435b7fcdfb2d827e88f44 (patch) | |
| tree | 68657080806668d18aaf721b8ab9562e9593ab04 | |
| parent | 6f21e28fd116ec3edf7f64ba2cc6d4da98b0a8b0 (diff) | |
| download | pyramid-e292cca8a2f07090697435b7fcdfb2d827e88f44.tar.gz pyramid-e292cca8a2f07090697435b7fcdfb2d827e88f44.tar.bz2 pyramid-e292cca8a2f07090697435b7fcdfb2d827e88f44.zip | |
rename wrapper_viewname and viewname to wrapper and name in deriver options
| -rw-r--r-- | pyramid/config/derivations.py | 4 | ||||
| -rw-r--r-- | pyramid/config/views.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pyramid/config/derivations.py b/pyramid/config/derivations.py index 59efeb0f4..e6179d35f 100644 --- a/pyramid/config/derivations.py +++ b/pyramid/config/derivations.py @@ -206,8 +206,8 @@ def mapped_view(view, info): return mapped_view def owrapped_view(view, info): - wrapper_viewname = info.options.get('wrapper_viewname') - viewname = info.options.get('viewname') + wrapper_viewname = info.options.get('wrapper') + viewname = info.options.get('name') if not wrapper_viewname: return view def _owrapped_view(context, request): diff --git a/pyramid/config/views.py b/pyramid/config/views.py index 890fd2113..0ffcc81b0 100644 --- a/pyramid/config/views.py +++ b/pyramid/config/views.py @@ -1226,8 +1226,8 @@ class ViewsConfiguratorMixin(object): permission=permission, attr=attr, renderer=renderer, - wrapper_viewname=wrapper_viewname, - viewname=viewname, + wrapper=wrapper_viewname, + name=viewname, accept=accept, order=order, phash=phash, |