diff options
| author | Chris McDonough <chrism@plope.com> | 2011-07-15 10:14:02 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2011-07-15 10:14:02 -0400 |
| commit | 049e0e76ead84806d8033b3de75dd037434f7637 (patch) | |
| tree | d47c6230bbab46bf83022730412296574c2893fb /docs/api | |
| parent | 4edda0d6d875ee0e7bc0375e4b314d78b1261f0e (diff) | |
| parent | c515d77de5b2f62727251ebc32d1292e67811771 (diff) | |
| download | pyramid-049e0e76ead84806d8033b3de75dd037434f7637.tar.gz pyramid-049e0e76ead84806d8033b3de75dd037434f7637.tar.bz2 pyramid-049e0e76ead84806d8033b3de75dd037434f7637.zip | |
Merge branch 'mmerickel-feature.scripting'
Diffstat (limited to 'docs/api')
| -rw-r--r-- | docs/api/config.rst | 12 | ||||
| -rw-r--r-- | docs/api/paster.rst | 15 | ||||
| -rw-r--r-- | docs/api/scripting.rst | 4 |
3 files changed, 24 insertions, 7 deletions
diff --git a/docs/api/config.rst b/docs/api/config.rst index 71ef4a746..2c394ac41 100644 --- a/docs/api/config.rst +++ b/docs/api/config.rst @@ -86,3 +86,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_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/scripting.rst b/docs/api/scripting.rst index 9d5bc2e58..79136a98b 100644 --- a/docs/api/scripting.rst +++ b/docs/api/scripting.rst @@ -7,3 +7,7 @@ .. autofunction:: get_root + .. autofunction:: prepare + + .. autofunction:: make_request + |