summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2010-11-10 19:31:42 -0500
committerChris McDonough <chrism@plope.com>2010-11-10 19:31:42 -0500
commit4eafaa0f6238ff0bd64729827e5974326fa6f60b (patch)
tree5301115b1890a10d44a7bb6d0e60aeaa326b4ee2 /docs
parent1328b24343c8d450ab930226b7daa7f6d4d9d2fa (diff)
downloadpyramid-4eafaa0f6238ff0bd64729827e5974326fa6f60b.tar.gz
pyramid-4eafaa0f6238ff0bd64729827e5974326fa6f60b.tar.bz2
pyramid-4eafaa0f6238ff0bd64729827e5974326fa6f60b.zip
- New API methods for ``pyramid.request.Request``: ``model_url`` and
``route_url``. These are simple passthroughs for their respective functions in ``pyramid.url``. - Documented the ``matchdict`` and ``matched_route`` attributes of the request object in the Request API documentation.
Diffstat (limited to 'docs')
-rw-r--r--docs/api/request.rst15
-rw-r--r--docs/narr/urldispatch.rst4
2 files changed, 19 insertions, 0 deletions
diff --git a/docs/api/request.rst b/docs/api/request.rst
index 90dc2e26e..acd66ccf8 100644
--- a/docs/api/request.rst
+++ b/docs/api/request.rst
@@ -97,4 +97,19 @@
The template context for Pylons-style applications.
+ .. attribute:: matchdict
+
+ If a :term:`route` has matched during this request, this attribute will
+ be a dictionary containing the values matched by the URL pattern
+ associated with the route. If a route has not matched during this
+ request, the value of this attribute will be ``None``. See
+ :ref:`matchdict`.
+
+ .. attribute:: matched_route
+
+ If a :term:`route` has matched during this request, this attribute will
+ be an obect representing the route matched by the URL pattern
+ associated with the route. If a route has not matched during this
+ request, the value of this attribute will be ``None``. See
+ :ref:`matched_route`.
diff --git a/docs/narr/urldispatch.rst b/docs/narr/urldispatch.rst
index c1e4b28e3..4442be355 100644
--- a/docs/narr/urldispatch.rst
+++ b/docs/narr/urldispatch.rst
@@ -763,6 +763,8 @@ finding` and :term:`view lookup`.
.. index::
single: matchdict
+.. _matchdict:
+
The Matchdict
~~~~~~~~~~~~~
@@ -781,6 +783,8 @@ strings. The values will be Unicode objects.
.. index::
single: matched_route
+.. _matched_route:
+
The Matched Route
~~~~~~~~~~~~~~~~~