diff options
| author | Bert JW Regeer <bertjw@regeer.org> | 2015-10-15 22:57:27 -0600 |
|---|---|---|
| committer | Bert JW Regeer <bertjw@regeer.org> | 2015-10-20 23:21:26 -0600 |
| commit | 2efc8202ddbaf0a331ba99d21257aeff47be63f8 (patch) | |
| tree | 8e85a632a07191a7eda546253838973270a91d43 | |
| parent | c6dffccf958588e113d4c5961b122217b7ac6d0d (diff) | |
| download | pyramid-2efc8202ddbaf0a331ba99d21257aeff47be63f8.tar.gz pyramid-2efc8202ddbaf0a331ba99d21257aeff47be63f8.tar.bz2 pyramid-2efc8202ddbaf0a331ba99d21257aeff47be63f8.zip | |
Rename the rest of the **predicates to **view_options
| -rw-r--r-- | pyramid/config/views.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pyramid/config/views.py b/pyramid/config/views.py index 17986e275..a92d76c1c 100644 --- a/pyramid/config/views.py +++ b/pyramid/config/views.py @@ -1250,7 +1250,7 @@ class ViewsConfiguratorMixin(object): decorator=None, mapper=None, match_param=None, - **predicates + **view_options ): """ Add a forbidden view to the current configuration state. The view will be called when Pyramid or application code raises a @@ -1280,7 +1280,7 @@ class ViewsConfiguratorMixin(object): .. versionadded:: 1.3 """ for arg in ('name', 'permission', 'context', 'for_', 'http_cache'): - if arg in predicates: + if arg in view_options: raise ConfigurationError( '%s may not be used as an argument to add_forbidden_view' % arg @@ -1310,7 +1310,7 @@ class ViewsConfiguratorMixin(object): attr=attr, renderer=renderer, ) - settings.update(predicates) + settings.update(view_options) return self.add_view(**settings) set_forbidden_view = add_forbidden_view # deprecated sorta-bw-compat alias @@ -1337,7 +1337,7 @@ class ViewsConfiguratorMixin(object): mapper=None, match_param=None, append_slash=False, - **predicates + **view_options ): """ Add a default Not Found View to the current configuration state. The view will be called when Pyramid or application code raises an @@ -1392,7 +1392,7 @@ class ViewsConfiguratorMixin(object): .. versionadded:: 1.3 """ for arg in ('name', 'permission', 'context', 'for_', 'http_cache'): - if arg in predicates: + if arg in view_options: raise ConfigurationError( '%s may not be used as an argument to add_notfound_view' % arg @@ -1420,7 +1420,7 @@ class ViewsConfiguratorMixin(object): route_name=route_name, permission=NO_PERMISSION_REQUIRED, ) - settings.update(predicates) + settings.update(view_options) if append_slash: view = self._derive_view(view, attr=attr, renderer=renderer) if IResponse.implementedBy(append_slash): |