diff options
| author | Chris McDonough <chrism@plope.com> | 2011-07-12 00:33:56 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2011-07-12 00:33:56 -0400 |
| commit | 321e34669f0b9119894cd1ee8c115361deba29f6 (patch) | |
| tree | 2fd805b413e67775b89cfee5cb537ec16474d127 | |
| parent | 7278cf91ea041222f3af814d19e3d1c2f0536ba0 (diff) | |
| download | pyramid-321e34669f0b9119894cd1ee8c115361deba29f6.tar.gz pyramid-321e34669f0b9119894cd1ee8c115361deba29f6.tar.bz2 pyramid-321e34669f0b9119894cd1ee8c115361deba29f6.zip | |
remove references to add_route view-related configuration
| -rw-r--r-- | docs/narr/urldispatch.rst | 9 | ||||
| -rw-r--r-- | pyramid/config.py | 19 |
2 files changed, 12 insertions, 16 deletions
diff --git a/docs/narr/urldispatch.rst b/docs/narr/urldispatch.rst index 8e2d240fa..779a884fb 100644 --- a/docs/narr/urldispatch.rst +++ b/docs/narr/urldispatch.rst @@ -394,13 +394,14 @@ the associated route to be considered a match during the route matching process. Examples of route predicate arguments are ``pattern``, ``xhr``, and ``request_method``. -Other arguments are view configuration related arguments. These only have an -effect when the route configuration names a ``view``. These arguments have -been deprecated as of :app:`Pyramid` 1.1 (see :ref:`add_route_view_config`). - Other arguments are ``name`` and ``factory``. These arguments represent neither predicates nor view configuration information. +.. warning:: Some arguments are view-configuration related arguments, such as + ``view_renderer``. These only have an effect when the route configuration + names a ``view`` and these arguments have been deprecated as of + :app:`Pyramid` 1.1. + .. _custom_route_predicates: Custom Route Predicates diff --git a/pyramid/config.py b/pyramid/config.py index 2e018f66f..8740d8448 100644 --- a/pyramid/config.py +++ b/pyramid/config.py @@ -1801,12 +1801,11 @@ class Configurator(object): should only be used to support older code bases which depend upon them.* Use a separate call to :meth:`pyramid.config.Configurator.add_view` to associate a view - with a route. See :ref:`add_route_view_config` for more info. + with a route using the ``route_name`` argument. view - .. warning:: Deprecated as of :app:`Pyramid` 1.1; see - :ref:`add_route_view_config`. + .. warning:: Deprecated as of :app:`Pyramid` 1.1. A Python object or :term:`dotted Python name` to the same object that will be used as a view callable when this route @@ -1814,9 +1813,8 @@ class Configurator(object): view_context - .. warning:: Deprecated as of :app:`Pyramid` 1.1; see - :ref:`add_route_view_config`. - + .. warning:: Deprecated as of :app:`Pyramid` 1.1. + A class or an :term:`interface` or :term:`dotted Python name` to the same object which the :term:`context` of the view should match for the view named by the route to be @@ -1831,8 +1829,7 @@ class Configurator(object): view_permission - .. warning:: Deprecated as of :app:`Pyramid` 1.1; see - :ref:`add_route_view_config`. + .. warning:: Deprecated as of :app:`Pyramid` 1.1. The permission name required to invoke the view associated with this route. e.g. ``edit``. (see @@ -1846,8 +1843,7 @@ class Configurator(object): view_renderer - .. warning:: Deprecated as of :app:`Pyramid` 1.1; see - :ref:`add_route_view_config`. + .. warning:: Deprecated as of :app:`Pyramid` 1.1. This is either a single string term (e.g. ``json``) or a string implying a path or :term:`asset specification` @@ -1871,8 +1867,7 @@ class Configurator(object): view_attr - .. warning:: Deprecated as of :app:`Pyramid` 1.1; see - :ref:`add_route_view_config`. + .. warning:: Deprecated as of :app:`Pyramid` 1.1. The view machinery defaults to using the ``__call__`` method of the view callable (or the function itself, if the view |