diff options
| -rw-r--r-- | docs/api/request.rst | 8 | ||||
| -rw-r--r-- | pyramid/scaffolds/__init__.py | 4 | ||||
| -rw-r--r-- | pyramid/testing.py | 6 | ||||
| -rw-r--r-- | pyramid/view.py | 2 | ||||
| -rw-r--r-- | pyramid/wsgi.py | 2 |
5 files changed, 11 insertions, 11 deletions
diff --git a/docs/api/request.rst b/docs/api/request.rst index 7b843f86e..b1f5918d7 100644 --- a/docs/api/request.rst +++ b/docs/api/request.rst @@ -190,16 +190,16 @@ :meth:`~pyramid.config.Configurator.set_request_property`) on the request it's passed. - - causes a :class:`~pyramid.event.NewRequest` event to be sent at the + - causes a :class:`~pyramid.events.NewRequest` event to be sent at the beginning of request processing. - - causes a :class:`~pyramid.event.ContextFound` event to be sent + - causes a :class:`~pyramid.events.ContextFound` event to be sent when a context resource is found. - + - Ensures that the user implied by the request passed has the necessary authorization to invoke view callable before calling it. - - causes a :class:`~pyramid.event.NewResponse` event to be sent when + - causes a :class:`~pyramid.events.NewResponse` event to be sent when the Pyramid application returns a response. - Calls any :term:`response callback` functions defined within the diff --git a/pyramid/scaffolds/__init__.py b/pyramid/scaffolds/__init__.py index d8fb9a62f..dc207b540 100644 --- a/pyramid/scaffolds/__init__.py +++ b/pyramid/scaffolds/__init__.py @@ -11,7 +11,7 @@ class PyramidTemplate(Template): templates. """ def pre(self, command, output_dir, vars): - """ Overrides :meth:`pyramid.scaffold.template.Template.pre`, adding + """ Overrides :meth:`pyramid.scaffolds.template.Template.pre`, adding several variables to the default variables list (including ``random_string``, and ``package_logger``). It also prevents common misnamings (such as naming a package "site" or naming a package @@ -30,7 +30,7 @@ class PyramidTemplate(Template): return Template.pre(self, command, output_dir, vars) def post(self, command, output_dir, vars): # pragma: no cover - """ Overrides :meth:`pyramid.scaffold.template.Template.post`, to + """ Overrides :meth:`pyramid.scaffolds.template.Template.post`, to print "Welcome to Pyramid. Sorry for the convenience." after a successful scaffolding rendering.""" self.out('Welcome to Pyramid. Sorry for the convenience.') diff --git a/pyramid/testing.py b/pyramid/testing.py index c4e83714d..b23094267 100644 --- a/pyramid/testing.py +++ b/pyramid/testing.py @@ -137,7 +137,7 @@ class DummyTemplateRenderer(object): def assert_(self, **kw): """ Accept an arbitrary set of assertion key/value pairs. For each assertion key/value pair assert that the renderer - (eg. :func:`pyramid.renderer.render_to_response`) + (eg. :func:`pyramid.renderers.render_to_response`) received the key with a value that equals the asserted value. If the renderer did not receive the key at all, or the value received by the renderer doesn't match the assertion @@ -591,10 +591,10 @@ def testConfig(registry=None, settings=None): """Returns a context manager for test set up. - This context manager calls :func:`pyramid.testing.testSetup` when + This context manager calls :func:`pyramid.testing.setUp` when entering and :func:`pyramid.testing.tearDown` when exiting. - All arguments are passed directly to :func:`pyramid.testing.testSetup`. + All arguments are passed directly to :func:`pyramid.testing.setUp`. If the ZCA is hooked, it will always be un-hooked in tearDown. This context manager allows you to write test code like this: diff --git a/pyramid/view.py b/pyramid/view.py index 76752ce8f..b64db69d2 100644 --- a/pyramid/view.py +++ b/pyramid/view.py @@ -226,7 +226,7 @@ class view_defaults(view_config): """ A class :term:`decorator` which, when applied to a class, will provide defaults for all view configurations that use the class. This decorator accepts all the arguments accepted by - :class:`pyramid.config.view_config`, and each has the same meaning. + :meth:`pyramid.view.view_config`, and each has the same meaning. See :ref:`view_defaults` for more information. """ diff --git a/pyramid/wsgi.py b/pyramid/wsgi.py index 5fa23d554..d176e4ce5 100644 --- a/pyramid/wsgi.py +++ b/pyramid/wsgi.py @@ -25,7 +25,7 @@ def wsgiapp(wrapped): The ``wsgiapp`` decorator will convert the result of the WSGI application to a :term:`Response` and return it to - :app:`Pyramid` as if the WSGI app were a :mod:`pyramid` + :app:`Pyramid` as if the WSGI app were a :app:`Pyramid` view. """ |