Changeset 799

Timestamp:

11/08/05 16:18:40

Author:

fumanchu

Message:

Fix for broken errorPage tests in Python 2.4.

Files:

• trunk/cherrypy/_cputil.py (modified) (2 diffs)
• trunk/cherrypy/test/helper.py (modified) (1 diff)

trunk/cherrypy/_cputil.py

@@ -228 +228 @@
-    # so don't bother cleaning up response values here.
-    response.status = status
+    response.body = getErrorPage(status, traceback=tb, message=message)
+    response.headerMap['Content-Length'] = len(response.body)
-    response.headerMap['Content-Type'] = "text/html"
-    response.body = getErrorPage(status, traceback=tb, message=message)
-    
-    be_ie_unfriendly(status)
-    
-    response.headerMap['Content-Length'] = len(response.body)
-
-
@@ -265 +264 @@
-        else:
-            response.body = [content]
+        response.headerMap['Content-Length'] = len(response.body[0])
-
-def formatExc(exc=None):

trunk/cherrypy/test/helper.py

@@ -136 +136 @@
-        
-        from cherrypy._cputil import getErrorPage
-esc = re.escape
+
-        # This will never contain a traceback:
-esc(getErrorPage(status, message=message)
+getErrorPage(status, message=message
-        
-        # First, test the response body without checking the traceback.
-        # Stick a match-all group (.*) in to grab the traceback.
-
-
-
+
+
+
+
+
+
-        if not m:
-            self._handlewebError('Error page does not match\n' + page)