diff options
| author | Michael Merickel <michael@merickel.org> | 2011-07-11 05:40:06 -0500 |
|---|---|---|
| committer | Michael Merickel <michael@merickel.org> | 2011-07-14 19:55:48 -0500 |
| commit | 37e3bebf0165ac5f32c82c0bc87296e0ca5fefd3 (patch) | |
| tree | 837aaf2458bd84f9d767656246d50b71866633c2 | |
| parent | 31c20b20346d93c326159cabe02cff076eb4ce0f (diff) | |
| download | pyramid-37e3bebf0165ac5f32c82c0bc87296e0ca5fefd3.tar.gz pyramid-37e3bebf0165ac5f32c82c0bc87296e0ca5fefd3.tar.bz2 pyramid-37e3bebf0165ac5f32c82c0bc87296e0ca5fefd3.zip | |
Added some docs for make_request and global_registries.
| -rw-r--r-- | docs/api/config.rst | 10 | ||||
| -rw-r--r-- | docs/api/scripting.rst | 2 | ||||
| -rw-r--r-- | pyramid/scripting.py | 2 |
3 files changed, 13 insertions, 1 deletions
diff --git a/docs/api/config.rst b/docs/api/config.rst index 71ef4a746..d021412b8 100644 --- a/docs/api/config.rst +++ b/docs/api/config.rst @@ -86,3 +86,13 @@ .. automethod:: testing_add_renderer + .. attribute:: global_registries + + A set of registries that have been created for :app:`Pyramid` + applications. 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/scripting.rst b/docs/api/scripting.rst index 9d5bc2e58..2029578ba 100644 --- a/docs/api/scripting.rst +++ b/docs/api/scripting.rst @@ -7,3 +7,5 @@ .. autofunction:: get_root + .. autofunction:: make_request + diff --git a/pyramid/scripting.py b/pyramid/scripting.py index d2495675e..fe942ceaf 100644 --- a/pyramid/scripting.py +++ b/pyramid/scripting.py @@ -39,7 +39,7 @@ def make_request(url, registry=None): templates. If ``registry`` is not supplied, the last registry loaded from - :meth:`pyramid.config.global_registries` will be used. If you have + :attr:`pyramid.config.global_registries` will be used. If you have loaded more than one :app:`Pyramid` application in the current process, you may not want to use the last registry loaded, thus you can search the ``global_registries`` and supply the appropriate |