diff options
| -rw-r--r-- | docs/api/config.rst | 88 | ||||
| -rw-r--r-- | docs/whatsnew-1.3.rst | 7 |
2 files changed, 48 insertions, 47 deletions
diff --git a/docs/api/config.rst b/docs/api/config.rst index 3fc2cfc44..87ba94673 100644 --- a/docs/api/config.rst +++ b/docs/api/config.rst @@ -7,56 +7,27 @@ .. autoclass:: Configurator - .. attribute:: registry - - The :term:`application registry` which holds the configuration - associated with this configurator. - - .. automethod:: begin - - .. automethod:: end - - .. automethod:: hook_zca - - .. automethod:: unhook_zca - - .. automethod:: get_settings - - .. automethod:: commit - - .. automethod:: action - - .. automethod:: include - - .. automethod:: add_directive - - .. automethod:: with_package - - .. automethod:: maybe_dotted + .. automethod:: add_route - .. automethod:: absolute_asset_spec + .. automethod:: add_view - .. automethod:: setup_registry + .. automethod:: add_static_view(name, path, cache_max_age=3600, permission=NO_PERMISSION_REQUIRED) .. automethod:: add_renderer - .. automethod:: add_response_adapter - - .. automethod:: add_route + .. automethod:: add_subscriber - .. automethod:: add_static_view(name, path, cache_max_age=3600, permission=NO_PERMISSION_REQUIRED) + .. automethod:: add_response_adapter .. automethod:: add_settings - .. automethod:: add_subscriber - .. automethod:: add_translation_dirs - .. automethod:: add_view - .. automethod:: add_tween - .. automethod:: derive_view + .. automethod:: add_traverser + + .. automethod:: add_resource_url_adapter .. automethod:: make_wsgi_app() @@ -94,17 +65,45 @@ .. automethod:: set_notfound_view - .. automethod:: add_traverser - .. automethod:: set_renderer_globals_factory(factory) + .. automethod:: begin + + .. automethod:: end + + .. automethod:: hook_zca + + .. automethod:: unhook_zca + + .. automethod:: get_settings + + .. automethod:: commit + + .. automethod:: action + + .. automethod:: include + + .. automethod:: add_directive + + .. automethod:: with_package + + .. automethod:: maybe_dotted + + .. automethod:: absolute_asset_spec + + .. automethod:: setup_registry + + .. automethod:: derive_view + .. attribute:: introspectable A shortcut attribute which points to the :class:`pyramid.registry.Introspectable` class (used during directives to provide introspection to actions). - This attribute is new as of :app:`Pyramid` 1.3. + .. note:: + + This attribute is new as of :app:`Pyramid` 1.3. .. attribute:: introspector @@ -114,7 +113,14 @@ ``introspector`` argument, this attribute will be that value. Otherwise, it will be an instance of a default introspector type. - This attribute is new as of :app:`Pyramid` 1.3. + .. note:: + + This attribute is new as of :app:`Pyramid` 1.3. + + .. attribute:: registry + + The :term:`application registry` which holds the configuration + associated with this configurator. .. attribute:: global_registries diff --git a/docs/whatsnew-1.3.rst b/docs/whatsnew-1.3.rst index acb884d49..d2df88093 100644 --- a/docs/whatsnew-1.3.rst +++ b/docs/whatsnew-1.3.rst @@ -243,11 +243,6 @@ Minor Feature Additions - We allow extra keyword arguments to be passed to the :meth:`pyramid.config.Configurator.action` method. -- New API: :meth:`pyramid.config.Configurator.set_request_property`. Add lazy - property descriptors to a request without changing the request factory. - This method provides conflict detection and is the suggested way to add - properties to a request. - - Responses generated by Pyramid's :class:`pyramid.views.static_view` now use a ``wsgi.file_wrapper`` (see http://www.python.org/dev/peps/pep-0333/#optional-platform-specific-file-handling) @@ -318,7 +313,7 @@ Minor Feature Additions partially. - A new API named :meth:`pyramid.request.Request.resource_path` now exists. - It works like :meth:`pyramid.request.Request.resource_url`` but produces a + It works like :meth:`pyramid.request.Request.resource_url` but produces a relative URL rather than an absolute one. - The :meth:`pyramid.request.Request.route_url` API now accepts these |