diff options
| author | zrayn <zshooter@gmail.com> | 2016-06-02 16:43:23 -0700 |
|---|---|---|
| committer | zrayn <zshooter@gmail.com> | 2016-06-02 16:43:23 -0700 |
| commit | 3216188e967d8dd4d9770ee45d9750f109d15ff6 (patch) | |
| tree | 880ffc3184a98bae1631f1ee426e9d09c0054eab | |
| parent | a5cbfca0f0567db8c00fe401dcfb895ab9860710 (diff) | |
| parent | 281a670eefe741627a4523ed5acb74da9c5180b3 (diff) | |
| download | pyramid-3216188e967d8dd4d9770ee45d9750f109d15ff6.tar.gz pyramid-3216188e967d8dd4d9770ee45d9750f109d15ff6.tar.bz2 pyramid-3216188e967d8dd4d9770ee45d9750f109d15ff6.zip | |
Merge branch 'master' into stip_pserve_daemon_support
| -rw-r--r-- | CONTRIBUTORS.txt | 2 | ||||
| -rw-r--r-- | pyramid/config/views.py | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index 7b6473e97..16023c821 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -272,3 +272,5 @@ Contributors - Berker Peksag, 2016/05/16 - Zack Brunson, 2016/06/02 + +- Marco Martinez, 2016/06/02 diff --git a/pyramid/config/views.py b/pyramid/config/views.py index 9e46ba155..5cb3f5099 100644 --- a/pyramid/config/views.py +++ b/pyramid/config/views.py @@ -885,6 +885,7 @@ class ViewsConfiguratorMixin(object): # __no_permission_required__ handled by _secure_view derived_view = self._derive_view( view, + route_name=route_name, permission=permission, predicates=preds, attr=attr, @@ -1331,7 +1332,7 @@ class ViewsConfiguratorMixin(object): def _derive_view(self, view, permission=None, predicates=(), attr=None, renderer=None, wrapper_viewname=None, viewname=None, accept=None, order=MAX_ORDER, - phash=DEFAULT_PHASH, decorator=None, + phash=DEFAULT_PHASH, decorator=None, route_name=None, mapper=None, http_cache=None, context=None, require_csrf=None, extra_options=None): view = self.maybe_dotted(view) @@ -1361,6 +1362,7 @@ class ViewsConfiguratorMixin(object): decorator=decorator, http_cache=http_cache, require_csrf=require_csrf, + route_name=route_name ) if extra_options: options.update(extra_options) |