diff options
| author | Chris McDonough <chrism@plope.com> | 2012-02-22 19:28:58 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2012-02-22 19:28:58 -0500 |
| commit | 6d0bce1dabce486cd6a6bc1fa7668ca863c0656a (patch) | |
| tree | 18f0c2d4c7cee39e8938d6c77b4e0792761382bd /docs/api | |
| parent | bb40d09a0241b9e19cdc86186a7abd30d4d491d3 (diff) | |
| parent | e9b51b719db22e3e41e3b22c584f40b20971aa98 (diff) | |
| download | pyramid-6d0bce1dabce486cd6a6bc1fa7668ca863c0656a.tar.gz pyramid-6d0bce1dabce486cd6a6bc1fa7668ca863c0656a.tar.bz2 pyramid-6d0bce1dabce486cd6a6bc1fa7668ca863c0656a.zip | |
Merge branch '1.3-branch'
Diffstat (limited to 'docs/api')
| -rw-r--r-- | docs/api/config.rst | 12 | ||||
| -rw-r--r-- | docs/api/registry.rst | 7 | ||||
| -rw-r--r-- | docs/api/view.rst | 9 |
3 files changed, 11 insertions, 17 deletions
diff --git a/docs/api/config.rst b/docs/api/config.rst index b76fed9cb..cd58e74d3 100644 --- a/docs/api/config.rst +++ b/docs/api/config.rst @@ -24,8 +24,8 @@ .. automethod:: add_route .. automethod:: add_static_view(name, path, cache_max_age=3600, permission=NO_PERMISSION_REQUIRED) .. automethod:: add_view - .. automethod:: set_forbidden_view - .. automethod:: set_notfound_view + .. automethod:: add_notfound_view + .. automethod:: add_forbidden_view :methodcategory:`Adding an Event Subscriber` @@ -76,18 +76,18 @@ .. automethod:: action .. automethod:: add_directive .. automethod:: with_package + .. automethod:: derive_view :methodcategory:`Utility Methods` .. automethod:: absolute_asset_spec - .. automethod:: derive_view .. automethod:: maybe_dotted - .. automethod:: setup_registry :methodcategory:`ZCA-Related APIs` .. automethod:: hook_zca .. automethod:: unhook_zca + .. automethod:: setup_registry :methodcategory:`Testing Helper APIs` @@ -112,9 +112,7 @@ The :term:`introspector` related to this configuration. It is an instance implementing the :class:`pyramid.interfaces.IIntrospector` - interface. If the Configurator constructor was supplied with an - ``introspector`` argument, this attribute will be that value. - Otherwise, it will be an instance of a default introspector type. + interface. .. note:: diff --git a/docs/api/registry.rst b/docs/api/registry.rst index e18d1b6c2..e62e2ba6f 100644 --- a/docs/api/registry.rst +++ b/docs/api/registry.rst @@ -38,10 +38,3 @@ This class is new as of :app:`Pyramid` 1.3. -.. class:: noop_introspector - - An introspector which throws away all registrations, useful for disabling - introspection altogether (pass as ``introspector`` to the - :term:`Configurator` constructor). - - This class is new as of :app:`Pyramid` 1.3. diff --git a/docs/api/view.rst b/docs/api/view.rst index 9f59ddae7..21d2bb90d 100644 --- a/docs/api/view.rst +++ b/docs/api/view.rst @@ -19,11 +19,14 @@ .. autoclass:: view_defaults :members: + .. autoclass:: notfound_view_config + :members: + + .. autoclass:: forbidden_view_config + :members: + .. autoclass:: static :members: :inherited-members: - .. autofunction:: append_slash_notfound_view(context, request) - - .. autoclass:: AppendSlashNotFoundViewFactory |