diff options
| author | Chris McDonough <chrism@plope.com> | 2010-12-30 18:51:31 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2010-12-30 18:51:31 -0500 |
| commit | 994fe8d880326e00de6b42720c1c71b2627747f9 (patch) | |
| tree | f2cf8705453c9c8e3b7ce046939232612f6338fd | |
| parent | 581a401c26047a6cddb6521393de4030ce0a962a (diff) | |
| parent | f82d090ef137ba56b84ad67e88bd9ae281884081 (diff) | |
| download | pyramid-994fe8d880326e00de6b42720c1c71b2627747f9.tar.gz pyramid-994fe8d880326e00de6b42720c1c71b2627747f9.tar.bz2 pyramid-994fe8d880326e00de6b42720c1c71b2627747f9.zip | |
Merge branch 'mgedmin-master'
| -rw-r--r-- | CONTRIBUTORS.txt | 3 | ||||
| -rw-r--r-- | pyramid/request.py | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index b48e769a1..ab75197e7 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -90,7 +90,7 @@ Licensing Exceptions Code committed within the ``docs/`` subdirectory of the Pyramid source control repository and "docstrings" which appear in the documentation -generated by runnning "make" within this directory is licensed under the +generated by running "make" within this directory is licensed under the Creative Commons Attribution-Noncommercial-Share Alike 3.0 United States License (http://creativecommons.org/licenses/by-nc-sa/3.0/us/). @@ -117,3 +117,4 @@ Contributors - Casey Duncan, 2010/12/27 +- Marius Gedminas, 2010/12/31 diff --git a/pyramid/request.py b/pyramid/request.py index 74418f1bb..475df744a 100644 --- a/pyramid/request.py +++ b/pyramid/request.py @@ -24,7 +24,7 @@ class Request(WebobRequest): argument. The documentation below (save for the ``add_response_callback`` and - ''add_finished_callback`` methods, which are defined in this subclass + ``add_finished_callback`` methods, which are defined in this subclass itself, and the attributes ``context``, ``registry``, ``root``, ``subpath``, ``traversed``, ``view_name``, ``virtual_root`` , and ``virtual_root_path``, each of which is added to the request by the |