Skip to content
Browse files

Merge branch 'refs/heads/master' into viewderiver

Conflicts:
	CONTRIBUTORS.txt
  • Loading branch information...
2 parents ae40397 + 994fe8d commit 4f355b634b32b77c6b35ddc31dfa772f075bf2ee Rob Miller committed Dec 30, 2010
Showing with 5 additions and 2 deletions.
  1. +3 −1 CONTRIBUTORS.txt
  2. +1 −0 pyramid/httpexceptions.py
  3. +1 −1 pyramid/request.py
View
4 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/).
@@ -118,3 +118,5 @@ Contributors
- Casey Duncan, 2010/12/27
- Rob Miller, 2010/12/28
+
+- Marius Gedminas, 2010/12/31
View
1 pyramid/httpexceptions.py
@@ -3,6 +3,7 @@
# Parent classes
from webob.exc import HTTPException
+from webob.exc import WSGIHTTPException
from webob.exc import HTTPOk
from webob.exc import HTTPRedirection
from webob.exc import HTTPError
View
2 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

0 comments on commit 4f355b6

Please sign in to comment.
Something went wrong with that request. Please try again.