Changeset 692

Timestamp:

09/28/05 19:07:23

Author:

fumanchu

Message:

1. Fix for #305 (produce an error if a custom error page file can not be opened).

2. Also, a fix in _cputil.getErrorPage, where messages (and other kwargs set to None) were not printing defaults.

3. Removed defunct "server.httpErrors" config entry.

Files:

• trunk/cherrypy/_cputil.py (modified) (1 diff)
• trunk/cherrypy/config.py (modified) (1 diff)
• trunk/cherrypy/test/test_core.py (modified) (4 diffs)

trunk/cherrypy/_cputil.py

@@ -189 +189 @@
-    
-    code, reason, message = cptools.validStatus(status)
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-    for k, v in kwargs.iteritems():
-        if v is None:
-            kwargs[k] = ""
+    
+    template = _HTTPErrorTemplate
+    errorPageFile = cherrypy.config.get('errorPage.%s' % code, '')
+    if errorPageFile:
+        try:
+            template = file(errorPageFile, 'rb')
+        except:
+            m = kwargs['message']
+            if m:
+                m += "<br />"
+            m += ("In addition, the custom error page "
+                  "failed:\n<br />%s" % (sys.exc_info()[1]))
+            kwargs['message'] = m
-    
-    return template % kwargs

trunk/cherrypy/config.py

@@ -49 +49 @@
-    
-    'server.environment': 'development',
-    'server.httpErrors' : True,
-    'server.protocolVersion': 'HTTP/1.0',
-    'server.logToScreen': True,

trunk/cherrypy/test/test_core.py

@@ -162 +162 @@
-class Error(Test):
-    
+    def custom(self):
+        raise cherrypy.HTTPError(404)
+    
-    def page_method(self):
-        raise ValueError()
@@ -265 +268 @@
-cherrypy.config.update({
-    'global': {'server.logToScreen': False,
-               'server.httpErrors' : False,
-               'server.environment': 'production',
-               'server.showTracebacks': True,
@@ -298 +300 @@
-    '/error/cause_err_in_finalize': {
-        'server.showTracebacks': False,
+    },
+    '/error/custom': {
+        'errorPage.404': "nonexistent.html",
-    },
-})
@@ -534 +539 @@
-        finally:
-            ignore.pop()
+        
+        # Test error in custom error page (ticket #305).
+        self.getPage("/error/custom")
+        self.assertStatus("404 Not Found")
+        msg = ("Nothing matches the given URI<br />"
+               "In addition, the custom error page failed:\n<br />"
+               "[Errno 2] No such file or directory: 'nonexistent.html'")
+        self.assertInBody(msg)
+
-    
-    def test_Ranges(self):