summaryrefslogtreecommitdiff
path: root/docs/api
diff options
context:
space:
mode:
Diffstat (limited to 'docs/api')
-rw-r--r--docs/api/config.rst14
-rw-r--r--docs/api/paster.rst15
-rw-r--r--docs/api/renderers.rst9
-rw-r--r--docs/api/scripting.rst2
-rw-r--r--docs/api/static.rst11
5 files changed, 44 insertions, 7 deletions
diff --git a/docs/api/config.rst b/docs/api/config.rst
index 71ef4a746..21e2b828d 100644
--- a/docs/api/config.rst
+++ b/docs/api/config.rst
@@ -78,6 +78,8 @@
.. automethod:: set_view_mapper
+ .. automethod:: add_request_handler
+
.. automethod:: testing_securitypolicy
.. automethod:: testing_resources
@@ -86,3 +88,15 @@
.. automethod:: testing_add_renderer
+ .. attribute:: global_registries
+
+ The set of registries that have been created for :app:`Pyramid`
+ applications, one per each call to
+ :meth:`pyramid.config.Configurator.make_wsgi_app` in the current
+ process. The object itself supports iteration and has a ``last``
+ property containing the last registry loaded.
+
+ The registries contained in this object are stored as weakrefs,
+ thus they will only exist for the lifetime of the actual
+ applications for which they are being used.
+
diff --git a/docs/api/paster.rst b/docs/api/paster.rst
index 6668f3c77..2a32e07e9 100644
--- a/docs/api/paster.rst
+++ b/docs/api/paster.rst
@@ -3,14 +3,15 @@
:mod:`pyramid.paster`
---------------------------
-.. module:: pyramid.paster
+.. automodule:: pyramid.paster
-.. function:: get_app(config_file, name=None)
+ .. function:: get_app(config_uri, name=None)
- Return the WSGI application named ``name`` in the PasteDeploy
- config file ``config_file``.
+ Return the WSGI application named ``name`` in the PasteDeploy
+ config file specified by ``config_uri``.
- If the ``name`` is None, this will attempt to parse the name from
- the ``config_file`` string expecting the format ``ini_file#name``.
- If no name is found, the name will default to "main".
+ If the ``name`` is None, this will attempt to parse the name from
+ the ``config_uri`` string expecting the format ``inifile#name``.
+ If no name is found, the name will default to "main".
+ .. autofunction:: bootstrap
diff --git a/docs/api/renderers.rst b/docs/api/renderers.rst
index c13694219..15670c46e 100644
--- a/docs/api/renderers.rst
+++ b/docs/api/renderers.rst
@@ -13,3 +13,12 @@
.. autoclass:: JSONP
+.. attribute:: null_renderer
+
+ An object that can be used in advanced integration cases as input to the
+ view configuration ``renderer=`` argument. When the null renderer is used
+ as a view renderer argument, Pyramid avoids converting the view callable
+ result into a Response object. This is useful if you want to reuse the
+ view configuration and lookup machinery outside the context of its use by
+ the Pyramid router (e.g. the package named ``pyramid_rpc`` does this).
+
diff --git a/docs/api/scripting.rst b/docs/api/scripting.rst
index 9d5bc2e58..51bd3c7a0 100644
--- a/docs/api/scripting.rst
+++ b/docs/api/scripting.rst
@@ -7,3 +7,5 @@
.. autofunction:: get_root
+ .. autofunction:: prepare
+
diff --git a/docs/api/static.rst b/docs/api/static.rst
new file mode 100644
index 000000000..c28473584
--- /dev/null
+++ b/docs/api/static.rst
@@ -0,0 +1,11 @@
+.. _static_module:
+
+:mod:`pyramid.static`
+---------------------
+
+.. automodule:: pyramid.static
+
+ .. autoclass:: static_view
+ :members:
+ :inherited-members:
+