Ticket #800: error_page_callable.patch

_cperror.py

@@ -148 +148 @@
-        raise self
-
-
+def clean_headers(status):
+    """Remove any headers which should not apply to an error response."""
+    import cherrypy
+    
+    response = cherrypy.response
+    
+    # Remove headers which applied to the original content,
+    # but do not apply to the error page.
+    respheaders = response.headers
+    for key in ["Accept-Ranges", "Age", "ETag", "Location", "Retry-After",
+                "Vary", "Content-Encoding", "Content-Length", "Expires",
+                "Content-Location", "Content-MD5", "Last-Modified"]:
+        if respheaders.has_key(key):
+            del respheaders[key]
+    
+    if status != 416:
+        # A server sending a response with status code 416 (Requested
+        # range not satisfiable) SHOULD include a Content-Range field
+        # with a byte-range-resp-spec of "*". The instance-length
+        # specifies the current length of the selected resource.
+        # A response with status code 206 (Partial Content) MUST NOT
+        # include a Content-Range field with a byte-range- resp-spec of "*".
+        if respheaders.has_key("Content-Range"):
+            del respheaders["Content-Range"]
+
+
-class HTTPError(CherryPyException):
-    """ Exception used to return an HTTP error code (4xx-5xx) to the client.
-        This exception will automatically set the response status and body.
@@ -173 +199 @@
-        
-        response = cherrypy.response
-        
-
-
-
-
-
-
-
-
+
-        
-        if self.status != 416:
-            # A server sending a response with status code 416 (Requested
-            # range not satisfiable) SHOULD include a Content-Range field
-            # with a byte-range-resp-spec of "*". The instance-length
-            # specifies the current length of the selected resource.
-            # A response with status code 206 (Partial Content) MUST NOT
-            # include a Content-Range field with a byte-range- resp-spec of "*".
-            if respheaders.has_key("Content-Range"):
-                del respheaders["Content-Range"]
-        
-        # In all cases, finalize will be called after this method,
-        # so don't bother cleaning up response values here.
-        response.status = self.status
-        tb = None
-        if cherrypy.request.show_tracebacks:
-            tb = format_exc()
-
+onse.
-        
-        content = self.get_error_page(self.status, traceback=tb,
-                                      message=self.message)
-        response.body = content
-
+onse.
-        
-        _be_ie_unfriendly(self.status)
-    

_cprequest.py

@@ -591 +591 @@
-                    self.hooks.run('before_finalize')
-                    cherrypy.response.finalize()
-                except (cherrypy.HTTPRedirect, cherrypy.HTTPError), inst:
-
+
+
+
+
+
-                    self.stage = 'before_finalize (HTTPError)'
-                    self.hooks.run('before_finalize')
-                    cherrypy.response.finalize()
@@ -715 +719 @@
-            self.params.update(p)
-    
-    def handle_error(self, exc):
-
+unanticipated 
-        try:
-            self.hooks.run("before_error_response")
-            if self.error_response:
@@ -723 +727 @@
-            self.hooks.run("after_error_response")
-            cherrypy.response.finalize()
-        except cherrypy.HTTPRedirect, inst:
-
+
+
+
+
+
-            cherrypy.response.finalize()
-
-

test/test_core.py

@@ -239 +239 @@
-        def as_refyield(self):
-            for chunk in self.as_yield():
-                yield chunk
-
-
+
+
+
+
+
+
+
+
-    class Error(Test):
-        
-        _cp_config = {'tools.log_tracebacks.on': True,
-                      }
-        
-
-
-
+
+
+
+
+
-        
-        def noexist(self):
-            raise cherrypy.HTTPError(404, "No, <b>really</b>, not found!")
@@ -725 +733 @@
-        self.assertStatus(404)
-        self.assertBody("Hello, world\r\n" + (" " * 499))
-        
+        # Test custom error page.
+        self.getPage("/error/custom?err=401")
+        self.assertStatus(401)
+        self.assertBody("Well, I'm very sorry but you haven't paid!")
+        
-        # Test error in custom error page (ticket #305).
-        # Note that the message is escaped for HTML (ticket #310).
-        self.getPage("/error/noexist")