Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Merge branch 'refs/heads/master' into viewderiver

Conflicts:
	CONTRIBUTORS.txt
  • Loading branch information...
commit 4f355b634b32b77c6b35ddc31dfa772f075bf2ee 2 parents ae40397 + 994fe8d
authored December 30, 2010
4  CONTRIBUTORS.txt
@@ -90,7 +90,7 @@ Licensing Exceptions
90 90
 
91 91
 Code committed within the ``docs/`` subdirectory of the Pyramid source
92 92
 control repository and "docstrings" which appear in the documentation
93  
-generated by runnning "make" within this directory is licensed under the
  93
+generated by running "make" within this directory is licensed under the
94 94
 Creative Commons Attribution-Noncommercial-Share Alike 3.0 United States
95 95
 License (http://creativecommons.org/licenses/by-nc-sa/3.0/us/).
96 96
 
@@ -118,3 +118,5 @@ Contributors
118 118
 - Casey Duncan, 2010/12/27
119 119
 
120 120
 - Rob Miller, 2010/12/28
  121
+
  122
+- Marius Gedminas, 2010/12/31
1  pyramid/httpexceptions.py
@@ -3,6 +3,7 @@
3 3
 
4 4
 # Parent classes
5 5
 from webob.exc import HTTPException
  6
+from webob.exc import WSGIHTTPException
6 7
 from webob.exc import HTTPOk
7 8
 from webob.exc import HTTPRedirection
8 9
 from webob.exc import HTTPError
2  pyramid/request.py
@@ -24,7 +24,7 @@ class Request(WebobRequest):
24 24
     argument.
25 25
 
26 26
     The documentation below (save for the ``add_response_callback`` and
27  
-    ''add_finished_callback`` methods, which are defined in this subclass
  27
+    ``add_finished_callback`` methods, which are defined in this subclass
28 28
     itself, and the attributes ``context``, ``registry``, ``root``,
29 29
     ``subpath``, ``traversed``, ``view_name``, ``virtual_root`` , and
30 30
     ``virtual_root_path``, each of which is added to the request by the

0 notes on commit 4f355b6

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