diff options
| author | Chris McDonough <chrism@plope.com> | 2010-11-17 13:52:28 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2010-11-17 13:52:28 -0500 |
| commit | 42ec1ec1de4e1ce6b70af1d5e520493d9d7ec91a (patch) | |
| tree | 357c8177f34cfa0027c42d5c4334384be6b11035 | |
| parent | 4f8c69f2ce04b5cb02b07c3891180cb46abd6aa2 (diff) | |
| parent | 8c6a4cea3ed0e588ffa395a99859cb1ac780360f (diff) | |
| download | pyramid-42ec1ec1de4e1ce6b70af1d5e520493d9d7ec91a.tar.gz pyramid-42ec1ec1de4e1ce6b70af1d5e520493d9d7ec91a.tar.bz2 pyramid-42ec1ec1de4e1ce6b70af1d5e520493d9d7ec91a.zip | |
Merge branch 'mgedmin-master'
| -rw-r--r-- | docs/narr/hybrid.rst | 2 | ||||
| -rw-r--r-- | pyramid/configuration.py | 2 | ||||
| -rw-r--r-- | pyramid/interfaces.py | 2 | ||||
| -rw-r--r-- | pyramid/testing.py | 4 | ||||
| -rw-r--r-- | pyramid/view.py | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/docs/narr/hybrid.rst b/docs/narr/hybrid.rst index 61ac68d5d..b89d10c9f 100644 --- a/docs/narr/hybrid.rst +++ b/docs/narr/hybrid.rst @@ -358,7 +358,7 @@ Using the ``traverse`` Argument In a Route Definition Rather than using the ``*traverse`` remainder marker in a pattern, you can use the ``traverse`` argument to the -:meth:`pyramid.configuration.Configurator.add_route`` method. +:meth:`pyramid.configuration.Configurator.add_route` method. When you use the ``*traverse`` remainder marker, the traversal path is limited to being the remainder segments of a request URL when a route diff --git a/pyramid/configuration.py b/pyramid/configuration.py index 3d1530406..3f959aabf 100644 --- a/pyramid/configuration.py +++ b/pyramid/configuration.py @@ -1559,7 +1559,7 @@ class Configurator(object): By default, ``categories`` is ``None`` which will execute *all* Venusian decorator callbacks including :app:`Pyramid`-related decorators such as - :class:`pyramid.view.view_config``. If this is not desirable + :class:`pyramid.view.view_config`. If this is not desirable because the codebase has other Venusian-using decorators that aren't meant to be invoked during a particular scan, use ``('pyramid',)`` as a ``categories`` value to limit the execution diff --git a/pyramid/interfaces.py b/pyramid/interfaces.py index 47bccf71f..9b895e020 100644 --- a/pyramid/interfaces.py +++ b/pyramid/interfaces.py @@ -166,7 +166,7 @@ class IRequestFactory(Interface): def blank(path): """ Return an empty request object (see - :meth:`pyramid.request.Request.blank``)""" + :meth:`pyramid.request.Request.blank`)""" class IViewClassifier(Interface): """ *Internal only* marker interface for views.""" diff --git a/pyramid/testing.py b/pyramid/testing.py index deb6c8d8e..c6c999147 100644 --- a/pyramid/testing.py +++ b/pyramid/testing.py @@ -119,7 +119,7 @@ def registerTemplateRenderer(path, renderer=None): .. warning:: This API is deprecated as of :app:`Pyramid` 1.0. Instead use the - :meth:`pyramid.configuration.Configurator.testing_add_template`` + :meth:`pyramid.configuration.Configurator.testing_add_template` method in your unit and integration tests. """ @@ -151,7 +151,7 @@ def registerView(name, result='', view=None, for_=(Interface, Interface), .. warning:: This API is deprecated as of :app:`Pyramid` 1.0. Instead use the - :meth:`pyramid.configuration.Configurator.add_view`` + :meth:`pyramid.configuration.Configurator.add_view` method in your unit and integration tests. """ for_ = (IViewClassifier, ) + for_ diff --git a/pyramid/view.py b/pyramid/view.py index ee2774aca..2ac51406e 100644 --- a/pyramid/view.py +++ b/pyramid/view.py @@ -177,7 +177,7 @@ class view_config(object): :class:`pyramid.view.bfg_view`. The following arguments are supported as arguments to - :class:`pyramid.view.view_config``: ``context``, ``permission``, + :class:`pyramid.view.view_config`: ``context``, ``permission``, ``name``, ``request_type``, ``route_name``, ``request_method``, ``request_param``, ``containment``, ``xhr``, ``accept``, ``header`` and ``path_info``. |